openc3 5.6.1 → 5.7.0

data/lib/openc3/models/widget_model.rb

@@ -72,8 +72,9 @@ module OpenC3
     def self.handle_config(parser, keyword, parameters, plugin: nil, needs_dependencies: false, scope:)
       case keyword
       when 'WIDGET'
-        parser.verify_num_parameters(1, 1, "WIDGET <Name>")
-        return self.new(name: parameters[0], plugin: plugin, needs_dependencies: needs_dependencies, scope: scope)
+        parser.verify_num_parameters(1, 2, "WIDGET <Name> <Label>")
+        # Label is optional and if it doesn't exist nil is fine
+        return self.new(name: parameters[0], plugin: plugin, label: parameters[1], needs_dependencies: needs_dependencies, scope: scope)
       else
         raise ConfigParser::Error.new(parser, "Unknown keyword and parameters for Widget: #{keyword} #{parameters.join(" ")}")
       end
@@ -84,6 +85,7 @@ module OpenC3
       name:,
       updated_at: nil,
       plugin: nil,
+      label: nil,
       needs_dependencies: false,
       scope:
     )
@@ -91,6 +93,7 @@ module OpenC3
       @full_name = @name.capitalize + 'Widget'
       @filename = @full_name + '.umd.min.js'
       @bucket_key = 'widgets/' + @full_name + '/' + @filename
+      @label = label
       @needs_dependencies = needs_dependencies
     end
 
@@ -99,6 +102,7 @@ module OpenC3
         'name' => @name,
         'updated_at' => @updated_at,
         'plugin' => @plugin,
+        'label' => @label,
         'needs_dependencies' => @needs_dependencies,
       }
     end

data/lib/openc3/operators/operator.rb

@@ -337,17 +337,19 @@ module OpenC3
       end
     end
 
+    def shutdown
+      @shutdown = true
+      @mutex.synchronize do
+        Logger.info("Shutting down processes...")
+        shutdown_processes(@processes)
+        Logger.info("Shutting down processes complete")
+        @shutdown_complete = true
+      end
+    end
+
     def run
       # Use at_exit to shutdown cleanly
-      at_exit do
-        @shutdown = true
-        @mutex.synchronize do
-          Logger.info("Shutting down processes...")
-          shutdown_processes(@processes)
-          Logger.info("Shutting down processes complete")
-          @shutdown_complete = true
-        end
-      end
+      at_exit { shutdown() }
 
       # Monitor processes and respawn if died
       Logger.info("#{self.class} Monitoring processes every #{@cycle_time} sec...")

data/lib/openc3/packets/parsers/xtce_parser.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 'nokogiri'
@@ -73,7 +73,7 @@ module OpenC3
       # Fortify complains about Path Manipulation here
       # We have previously validated the file is a .xtce file in packet_config
       # The file is opened read-only and then immediately parsed by Nokogiri
-      doc = File.open(filename) { |f| Nokogiri::XML(f, nil, nil, Nokogiri::XML::ParseOptions::STRICT | Nokogiri::XML::ParseOptions::NOBLANKS) }
+      doc = File.open(filename) { |f| Nokogiri::XML(f, nil, nil, Nokogiri::XML::ParseOptions::STRICT | Nokogiri::XML::ParseOptions::NOBLANKS | Nokogiri::XML::ParseOptions::HUGE) }
       # Determine the @current_target_name
       xtce_process_element(doc.root)
       @current_target_name = target_name if target_name
@@ -699,6 +699,8 @@ module OpenC3
               # Strip quotes from strings
               if type.initialValue[0] == '"' && type.initialValue[-1] == '"'
                 item.default = type.initialValue[1..-2]
+              else
+                item.default = type.initialValue
               end
             end
           else

data/lib/openc3/script/api_shared.rb

@@ -165,7 +165,7 @@ module OpenC3
     #
     # @param args [String|Array<String>] See the description for calling style
     # @param type [Symbol] Telemetry type, :RAW, :CONVERTED (default), :FORMATTED, or :WITH_UNITS
-    def wait(*args, type: :CONVERTED, scope: $openc3_scope, token: $openc3_token)
+    def wait(*args, type: :CONVERTED, quiet: false, scope: $openc3_scope, token: $openc3_token)
       time = nil
 
       case args.length
@@ -174,7 +174,7 @@ module OpenC3
         start_time = Time.now.sys
         openc3_script_sleep()
         time = Time.now.sys - start_time
-        Logger.info("WAIT: Indefinite for actual time of #{time} seconds")
+        Logger.info("WAIT: Indefinite for actual time of #{time} seconds") unless quiet
 
       # wait(5) # absolute wait time
       when 1
@@ -182,7 +182,7 @@ module OpenC3
           start_time = Time.now.sys
           openc3_script_sleep(args[0])
           time = Time.now.sys - start_time
-          Logger.info("WAIT: #{args[0]} seconds with actual time of #{time} seconds")
+          Logger.info("WAIT: #{args[0]} seconds with actual time of #{time} seconds") unless quiet
         else
           raise "Non-numeric wait time specified"
         end
@@ -196,7 +196,7 @@ module OpenC3
         else
           polling_rate = DEFAULT_TLM_POLLING_RATE
         end
-        _execute_wait(target_name, packet_name, item_name, type, comparison_to_eval, timeout, polling_rate, scope: scope, token: token)
+        _execute_wait(target_name, packet_name, item_name, type, comparison_to_eval, timeout, polling_rate, quiet: quiet, scope: scope, token: token)
 
       # wait('target_name', 'packet_name', 'item_name', comparison_to_eval, timeout, polling_rate) # polling_rate is optional
       when 5, 6
@@ -210,7 +210,7 @@ module OpenC3
         else
           polling_rate = DEFAULT_TLM_POLLING_RATE
         end
-        _execute_wait(target_name, packet_name, item_name, type, comparison_to_eval, timeout, polling_rate, scope: scope, token: token)
+        _execute_wait(target_name, packet_name, item_name, type, comparison_to_eval, timeout, polling_rate, quiet: quiet, scope: scope, token: token)
 
       else
         # Invalid number of arguments
@@ -220,8 +220,8 @@ module OpenC3
     end
 
     # @deprecated Use wait with type: :RAW
-    def wait_raw(*args, scope: $openc3_scope, token: $openc3_token)
-      wait(*args, type: :RAW, scope: scope, token: token)
+    def wait_raw(*args, quiet: false, scope: $openc3_scope, token: $openc3_token)
+      wait(*args, type: :RAW, quiet: quiet, scope: scope, token: token)
     end
 
     # Wait on an expression to be true. On a timeout, the script will continue.
@@ -232,7 +232,7 @@ module OpenC3
     #
     # @param args [String|Array<String>] See the description for calling style
     # @param type [Symbol] Telemetry type, :RAW or :CONVERTED (default)
-    def wait_tolerance(*args, type: :CONVERTED, scope: $openc3_scope, token: $openc3_token)
+    def wait_tolerance(*args, type: :CONVERTED, quiet: false, scope: $openc3_scope, token: $openc3_token)
       raise "Invalid type '#{type}' for wait_tolerance" unless %i(RAW CONVERTED).include?(type)
 
       target_name, packet_name, item_name, expected_value, tolerance, timeout, polling_rate = _wait_tolerance_process_args(args, scope: scope, token: token)
@@ -257,9 +257,9 @@ module OpenC3
         end
 
         if success
-          Logger.info message
+          Logger.info message unless quiet
         else
-          Logger.warn message
+          Logger.warn message unless quiet
         end
       else
         success, value = openc3_script_wait_implementation_tolerance(target_name, packet_name, item_name, type, expected_value, tolerance, timeout, polling_rate, scope: scope, token: token)
@@ -268,28 +268,28 @@ module OpenC3
         wait_str = "WAIT: #{_upcase(target_name, packet_name, item_name)}"
         range_str = "range #{range.first} to #{range.last} with value == #{value} after waiting #{time} seconds"
         if success
-          Logger.info "#{wait_str} was within #{range_str}"
+          Logger.info "#{wait_str} was within #{range_str}" unless quiet
         else
-          Logger.warn "#{wait_str} failed to be within #{range_str}"
+          Logger.warn "#{wait_str} failed to be within #{range_str}" unless quiet
         end
       end
       time
     end
 
     # @deprecated Use wait_tolerance with type: :RAW
-    def wait_tolerance_raw(*args, scope: $openc3_scope, token: $openc3_token)
-      wait_tolerance(*args, type: :RAW, scope: scope, token: token)
+    def wait_tolerance_raw(*args, quiet: false, scope: $openc3_scope, token: $openc3_token)
+      wait_tolerance(*args, type: :RAW, quiet: quiet, scope: scope, token: token)
     end
 
     # Wait on a custom expression to be true
-    def wait_expression(exp_to_eval, timeout, polling_rate = DEFAULT_TLM_POLLING_RATE, context = nil, scope: $openc3_scope, token: $openc3_token)
+    def wait_expression(exp_to_eval, timeout, polling_rate = DEFAULT_TLM_POLLING_RATE, context = nil, quiet: false, scope: $openc3_scope, token: $openc3_token)
       start_time = Time.now.sys
       success = openc3_script_wait_implementation_expression(exp_to_eval, timeout, polling_rate, context, scope: scope, token: token)
       time = Time.now.sys - start_time
       if success
-        Logger.info "WAIT: #{exp_to_eval} is TRUE after waiting #{time} seconds"
+        Logger.info "WAIT: #{exp_to_eval} is TRUE after waiting #{time} seconds" unless quiet
       else
-        Logger.warn "WAIT: #{exp_to_eval} is FALSE after waiting #{time} seconds"
+        Logger.warn "WAIT: #{exp_to_eval} is FALSE after waiting #{time} seconds" unless quiet
       end
       time
     end
@@ -427,8 +427,9 @@ module OpenC3
                     num_packets,
                     timeout,
                     polling_rate = DEFAULT_TLM_POLLING_RATE,
+                    quiet: false,
                     scope: $openc3_scope, token: $openc3_token)
-      _wait_packet(false, target_name, packet_name, num_packets, timeout, polling_rate, scope: scope, token: token)
+      _wait_packet(false, target_name, packet_name, num_packets, timeout, polling_rate, quiet: quiet, scope: scope, token: token)
     end
 
     # Wait for a telemetry packet to be received a certain number of times or timeout and raise an error
@@ -437,8 +438,9 @@ module OpenC3
                           num_packets,
                           timeout,
                           polling_rate = DEFAULT_TLM_POLLING_RATE,
+                          quiet: false,
                           scope: $openc3_scope, token: $openc3_token)
-      _wait_packet(true, target_name, packet_name, num_packets, timeout, polling_rate, scope: scope, token: token)
+      _wait_packet(true, target_name, packet_name, num_packets, timeout, polling_rate, quiet: quiet, scope: scope, token: token)
     end
 
     def disable_instrumentation
@@ -592,6 +594,7 @@ module OpenC3
                      num_packets,
                      timeout,
                      polling_rate = DEFAULT_TLM_POLLING_RATE,
+                     quiet: false,
                      scope: $openc3_scope, token: $openc3_token)
       type = (check ? 'CHECK' : 'WAIT')
       initial_count = tlm(target_name, packet_name, 'RECEIVED_COUNT', scope: scope, token: token)
@@ -611,7 +614,7 @@ module OpenC3
       value = 0 unless value
       time = Time.now.sys - start_time
       if success
-        Logger.info "#{type}: #{target_name.upcase} #{packet_name.upcase} received #{value - initial_count} times after waiting #{time} seconds"
+        Logger.info "#{type}: #{target_name.upcase} #{packet_name.upcase} received #{value - initial_count} times after waiting #{time} seconds" unless quiet
       else
         message = "#{type}: #{target_name.upcase} #{packet_name.upcase} expected to be received #{num_packets} times but only received #{value - initial_count} times after waiting #{time} seconds"
         if check
@@ -621,13 +624,13 @@ module OpenC3
             raise CheckError, message
           end
         else
-          Logger.warn message
+          Logger.warn message unless quiet
         end
       end
       time
     end
 
-    def _execute_wait(target_name, packet_name, item_name, value_type, comparison_to_eval, timeout, polling_rate, scope: $openc3_scope, token: $openc3_token)
+    def _execute_wait(target_name, packet_name, item_name, value_type, comparison_to_eval, timeout, polling_rate, quiet: false, scope: $openc3_scope, token: $openc3_token)
       start_time = Time.now.sys
       success, value = openc3_script_wait_implementation(target_name, packet_name, item_name, value_type, comparison_to_eval, timeout, polling_rate, scope: scope, token: token)
       value = "'#{value}'" if value.is_a? String # Show user the check against a quoted string
@@ -635,9 +638,9 @@ module OpenC3
       wait_str = "WAIT: #{_upcase(target_name, packet_name, item_name)} #{comparison_to_eval}"
       value_str = "with value == #{value} after waiting #{time} seconds"
       if success
-        Logger.info "#{wait_str} success #{value_str}"
+        Logger.info "#{wait_str} success #{value_str}" unless quiet
       else
-        Logger.warn "#{wait_str} failed #{value_str}"
+        Logger.warn "#{wait_str} failed #{value_str}" unless quiet
       end
     end
 

data/lib/openc3/script/storage.rb

@@ -106,6 +106,7 @@ module OpenC3
             if local_file
               OpenC3::Logger.info "Reading local #{scope}/#{path}"
               file = Tempfile.new('target', binmode: true)
+              file.filename = path
               file.write(local_file.read)
               local_file.close
               file.rewind
@@ -126,11 +127,14 @@ module OpenC3
       end
     end
 
+    # download_file(path_or_file) is implemented by running_script to download a file
+
     # These are helper methods ... should not be used directly
 
     def _get_storage_file(path, scope: $openc3_scope)
       # Create Tempfile to store data
       file = Tempfile.new('target', binmode: true)
+      file.filename = path
 
       endpoint = "/openc3-api/storage/download/#{scope}/#{path}"
       result = _get_presigned_request(endpoint, scope: scope)

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

@@ -129,7 +129,9 @@ module OpenC3
       binary
     end
 
-    def self.build_json(binary, definition_filename)
+    # We build the json hash without converting to a json string to allow modifying the hash
+    # app/models/table.rb uses this ability to add the real definition filename
+    def self.build_json_hash(binary, definition_filename)
       config = TableConfig.process_file(definition_filename)
       tables = []
       json = { tables: tables }
@@ -189,7 +191,7 @@ module OpenC3
           end
         end
       end
-      json.as_json(:allow_nan => true).to_json(:allow_nan => true)
+      json.as_json(:allow_nan => true)
     end
 
     def self.load_binary(config, data)

data/lib/openc3/utilities/ruby_lex_utils.rb

@@ -226,11 +226,11 @@ class RubyLexUtils
     previous_indent = 0
 
     while lexed = lex.lex
-      #puts "lexed = #{lexed.chomp}, indent = #{lex.indent}, continue = #{lex.continue}"
+      #puts "lexed = #{lexed.chomp}, indent = #{lex.indent}, continue = #{lex.continue}, ltype = #{lex.ltype.inspect}, code_block_open = #{lex.code_block_open}"
       lex.line_no += lexed.count("\n")
       lex.line.concat lexed
       line.concat lexed
-      if lex.continue
+      if lex.continue or lex.ltype
         if not continue_block?(lexed)
           unless continue_indent
             if (lex.indent - previous_indent) > 1
@@ -292,32 +292,9 @@ class RubyLexUtils
         end
 
         if contains_keyword?(line)
-          if contains_block_beginning?(line)
-            section = ''
-            line.each_line do |lexed_part|
-              section << lexed_part
-              if contains_block_beginning?(section)
-                yield section, false, inside_begin, lex.exp_line_no
-                break
-              end
-              lex.exp_line_no += 1
-            end
-            lex.exp_line_no += 1
-            remainder = line[(section.length)..-1]
-            line = remainder
-            next unless remainder.empty?
-          else
-            yield line, false, inside_begin, lex.exp_line_no
-          end
+          yield line, false, inside_begin, lex.exp_line_no
         elsif !line.empty?
-          num_left_brackets  = line.count('{')
-          num_right_brackets = line.count('}')
-          if num_left_brackets != num_right_brackets
-            # Don't instrument lines with unequal numbers of { and } brackets
-            yield line, false, inside_begin, lex.exp_line_no
-          else
-            yield line, true, inside_begin, lex.exp_line_no
-          end
+          yield line, true, inside_begin, lex.exp_line_no
         end
         line = ''
         lex.exp_line_no = lex.line_no

data/lib/openc3/utilities/store_autoload.rb

@@ -159,6 +159,7 @@ module OpenC3
 
     unless $openc3_redis_cluster
       def read_topics(topics, offsets = nil, timeout_ms = 1000, count = nil)
+        return {} if topics.empty?
         Thread.current[:topic_offsets] ||= {}
         topic_offsets = Thread.current[:topic_offsets]
         begin

data/lib/openc3/version.rb

@@ -1,14 +1,14 @@
 # encoding: ascii-8bit
 
-OPENC3_VERSION = '5.6.1'
+OPENC3_VERSION = '5.7.0'
 module OpenC3
   module Version
     MAJOR = '5'
-    MINOR = '6'
-    PATCH = '1'
+    MINOR = '7'
+    PATCH = '0'
     OTHER = ''
-    BUILD = '86a8498603e3f90548f20613cb5b596c906f2a9e'
+    BUILD = 'ad11dde957c7d04de9c45d6fb8d6226a812ced9c'
   end
-  VERSION = '5.6.1'
-  GEM_VERSION = '5.6.1'
+  VERSION = '5.7.0'
+  GEM_VERSION = '5.7.0'
 end

data/templates/widget/package.json

@@ -1,17 +1,17 @@
 {
   "name": "widget",
-  "version": "5.6.1",
+  "version": "5.7.0",
   "private": true,
   "scripts": {
     "build": "vue-cli-service build --target lib --dest tools/widgets/<%= widget_name %> --formats umd-min <%= widget_path %> --name <%= widget_name %>"
   },
   "dependencies": {
-    "@openc3/tool-common": "5.6.1",
+    "@openc3/tool-common": "5.7.0",
     "vue": "2.7.14",
     "vuetify": "2.6.14"
   },
   "devDependencies": {
-    "@babel/eslint-parser": "7.21.3",
+    "@babel/eslint-parser": "7.21.8",
     "@rushstack/eslint-patch": "1.2.0",
     "@vue/babel-preset-app": "5.0.8",
     "@vue/cli": "5.0.8",
@@ -21,15 +21,15 @@
     "@vue/eslint-config-prettier": "7.1.0",
     "babel-loader": "9.1.2",
     "babel-plugin-istanbul": "6.1.1",
-    "eslint": "8.38.0",
+    "eslint": "8.40.0",
     "eslint-config-prettier": "8.8.0",
     "eslint-plugin-prettier": "4.2.1",
-    "eslint-plugin-vue": "9.11.0",
-    "prettier": "2.8.7",
-    "sass": "1.62.0",
+    "eslint-plugin-vue": "9.11.1",
+    "prettier": "2.8.8",
+    "sass": "1.62.1",
     "sass-loader": "13.2.2",
     "vue-cli-plugin-vuetify": "2.5.8",
     "vue-template-compiler": "2.7.14",
-    "webpack": "5.79.0"
+    "webpack": "5.82.0"
   }
 }