openc3 5.11.0 → 5.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: beada8d3ae31acc7a45fff23d454f4667b552a5de293f6c17f6da72626dd8490
-  data.tar.gz: 950b07bf2f6a3173284d41a77ae7abf4cf6f9582a885dbedc585d50001fadcd8
+  metadata.gz: 5026df00ed04704e22029423bc09cae31eaebb798517ee02f1fcef3d60c4dfc0
+  data.tar.gz: 96c671d4a686c15d1db84489528f0551cb0cb54b42d21410839fc65f927c5360
 SHA512:
-  metadata.gz: 7b0e9f874d5a88c167ba9bd78c3718d1b646ab80560106e01fb109189c27d6b399a3f51531b23815129ea24f4b9194770c9448d8e4be832c0926a6f5b8c3f9ad
-  data.tar.gz: e5c20e0648e27b311de33c0d06eb27bb229110eac0fcf197619dac6a3232b239334cbda07bf3f79e88ddb7425b773191c04f9929883a6042b36633c99924285a
+  metadata.gz: 76cdc1efc5b5094da9c84fde2ce27fe9b850f594a2ffa09ab736b6ec98f3f1a73c20700ac4e409dd1c3632cdb208e1695b37aada33af2dce548633b771035021
+  data.tar.gz: 4142f4251262cc43f60bdfa4d54300e2282a2c2759991ebfd623a046c1e97a8ac929aec764b05fae59fa874b99957bfc492199219e9ec70dfa3a9315afb9206a

data/README.md

@@ -17,7 +17,6 @@ set OPENC3_REDIS_USERNAME=openc3
 set OPENC3_REDIS_PASSWORD=openc3password
 set OPENC3_BUCKET_USERNAME=openc3minio
 set OPENC3_BUCKET_PASSWORD=openc3miniopassword
-set OPENC3_SERVICE_PASSWORD=openc3service
 set OPENC3_SR_REDIS_USERNAME=scriptrunner
 set OPENC3_SR_REDIS_PASSWORD=scriptrunnerpassword
 set OPENC3_SR_BUCKET_USERNAME=scriptrunnerminio
@@ -31,7 +30,6 @@ OPENC3_REDIS_USERNAME=openc3
 OPENC3_REDIS_PASSWORD=openc3password
 OPENC3_BUCKET_USERNAME=openc3minio
 OPENC3_BUCKET_PASSWORD=openc3miniopassword
-OPENC3_SERVICE_PASSWORD=openc3service
 OPENC3_SR_REDIS_USERNAME=scriptrunner
 OPENC3_SR_REDIS_PASSWORD=scriptrunnerpassword
 OPENC3_SR_BUCKET_USERNAME=scriptrunnerminio

data/lib/openc3/api/metrics_api.rb

@@ -36,9 +36,12 @@ module OpenC3
 
     DURATION_METRICS = {}
     DURATION_METRICS['decom_duration_seconds'] = 0.0
-    DURATION_METRICS['reducer_minute_processing_seconds'] = 0
-    DURATION_METRICS['reducer_hour_processing_seconds'] = 0
-    DURATION_METRICS['reducer_day_processing_seconds'] = 0
+    DURATION_METRICS['reducer_minute_processing_sample_seconds'] = 0.0
+    DURATION_METRICS['reducer_hour_processing_sample_seconds'] = 0.0
+    DURATION_METRICS['reducer_day_processing_sample_seconds'] = 0.0
+    DURATION_METRICS['reducer_minute_processing_max_seconds'] = 0.0
+    DURATION_METRICS['reducer_hour_processing_max_seconds'] = 0.0
+    DURATION_METRICS['reducer_day_processing_max_seconds'] = 0.0
 
     SUM_METRICS = {}
     SUM_METRICS['cleanup_total'] = 0
@@ -51,8 +54,12 @@ module OpenC3
     SUM_METRICS['log_total'] = 0
     SUM_METRICS['log_error_total'] = 0
     SUM_METRICS['periodic_total'] = 0
-    SUM_METRICS['reducer_total'] = 0
-    SUM_METRICS['reducer_error_total'] = 0
+    SUM_METRICS['reducer_minute_total'] = 0
+    SUM_METRICS['reducer_hour_total'] = 0
+    SUM_METRICS['reducer_day_total'] = 0
+    SUM_METRICS['reducer_minute_error_total'] = 0
+    SUM_METRICS['reducer_hour_error_total'] = 0
+    SUM_METRICS['reducer_day_error_total'] = 0
     SUM_METRICS['router_cmd_total'] = 0
     SUM_METRICS['router_tlm_total'] = 0
     SUM_METRICS['router_directive_total'] = 0

data/lib/openc3/io/json_api.rb

@@ -53,7 +53,7 @@ module OpenC3
     # generate the auth object
     def _generate_auth
       if ENV['OPENC3_API_TOKEN'].nil? and ENV['OPENC3_API_USER'].nil?
-        if ENV['OPENC3_API_PASSWORD'] || ENV['OPENC3_SERVICE_PASSWORD']
+        if ENV['OPENC3_API_PASSWORD']
           return OpenC3Authentication.new()
         else
           return nil

data/lib/openc3/io/json_api_object.rb

@@ -72,7 +72,7 @@ module OpenC3
     # generate the auth object
     def generate_auth
       if ENV['OPENC3_API_TOKEN'].nil? and ENV['OPENC3_API_USER'].nil?
-        if ENV['OPENC3_API_PASSWORD'] || ENV['OPENC3_SERVICE_PASSWORD']
+        if ENV['OPENC3_API_PASSWORD']
           return OpenC3Authentication.new()
         else
           return nil

data/lib/openc3/logs/log_writer.rb

@@ -281,7 +281,9 @@ module OpenC3
       OpenC3.handle_critical_exception(err)
     end
 
-    def prepare_write(time_nsec_since_epoch, data_length, redis_topic = nil, redis_offset = nil, allow_new_file: true)
+    # @enforce_time_order requires the timestamps on each write to be greater than the previous
+    # process_out_of_order ignores the timestamps for the current entry (used to ignore timestamps on metadata entries, vs actual packets)
+    def prepare_write(time_nsec_since_epoch, data_length, redis_topic = nil, redis_offset = nil, allow_new_file: true, process_out_of_order: true)
       # This check includes logging_enabled again because it might have changed since we acquired the mutex
       # Ensures new files based on size, and ensures always increasing time order in files
       if @logging_enabled
@@ -291,7 +293,7 @@ module OpenC3
         elsif @cycle_size and ((@file_size + data_length) > @cycle_size)
           Logger.debug("Log writer start new file due to cycle size #{@cycle_size}")
           start_new_file() if allow_new_file
-        elsif @enforce_time_order and @previous_time_nsec_since_epoch and (@previous_time_nsec_since_epoch > time_nsec_since_epoch)
+        elsif process_out_of_order and @enforce_time_order and @previous_time_nsec_since_epoch and (@previous_time_nsec_since_epoch > time_nsec_since_epoch)
           # Warning: Creating new files here can cause lots of files to be created if packets make it through out of order
           # Changed to just a error to prevent file thrashing
           unless @out_of_order
@@ -301,7 +303,7 @@ module OpenC3
         end
       end
       @last_offsets[redis_topic] = redis_offset if redis_topic and redis_offset # This is needed for the redis offset marker entry at the end of the log file
-      @previous_time_nsec_since_epoch = time_nsec_since_epoch
+      @previous_time_nsec_since_epoch = time_nsec_since_epoch if process_out_of_order
     end
 
     # Closing a log file isn't critical so we just log an error. NOTE: This also trims the Redis stream

data/lib/openc3/logs/packet_log_writer.rb

@@ -95,7 +95,14 @@ module OpenC3
 
       @mutex.lock if take_mutex
       begin
-        prepare_write(time_nsec_since_epoch, data.length, redis_topic, redis_offset, allow_new_file: allow_new_file)
+        if entry_type == :RAW_PACKET or entry_type == :JSON_PACKET
+          # Only care about the timestamps on the real packets being in order
+          process_out_of_order = true
+        else
+          # Metadata timestamps don't matter
+          process_out_of_order = false
+        end
+        prepare_write(time_nsec_since_epoch, data.length, redis_topic, redis_offset, allow_new_file: allow_new_file, process_out_of_order: process_out_of_order)
         write_entry(entry_type, cmd_or_tlm, target_name, packet_name, time_nsec_since_epoch, stored, data, id, received_time_nsec_since_epoch: received_time_nsec_since_epoch, extra: extra) if @file
       ensure
         @mutex.unlock if take_mutex

data/lib/openc3/microservices/reducer_microservice.rb

@@ -30,6 +30,7 @@ require 'openc3/models/reducer_model'
 require 'openc3/logs/buffered_packet_log_writer'
 require 'openc3/ext/reducer_microservice' if RUBY_ENGINE == 'ruby' and !ENV['OPENC3_NO_EXT']
 require 'rufus-scheduler'
+require 'thread'
 
 module OpenC3
   class ReducerState
@@ -75,9 +76,9 @@ module OpenC3
   end
 
   class ReducerMicroservice < Microservice
-    MINUTE_METRIC = 'reducer_minute_processing_seconds'
-    HOUR_METRIC = 'reducer_hour_processing_seconds'
-    DAY_METRIC = 'reducer_day_processing_seconds'
+    MINUTE_METRIC = 'reducer_minute_processing'
+    HOUR_METRIC = 'reducer_hour_processing'
+    DAY_METRIC = 'reducer_day_processing'
 
     # How long to wait for any currently running jobs to complete before killing them
     SHUTDOWN_DELAY_SECS = 5
@@ -106,14 +107,28 @@ module OpenC3
         end
       end
 
-      @buffer_depth = 10 unless @buffer_depth
+      @buffer_depth = 60 unless @buffer_depth
       @max_cpu_utilization = 30.0 unless @max_cpu_utilization
       @target_name = name.split('__')[-1]
       @packet_logs = {}
+      @mutex = Mutex.new
+      @previous_metrics = {}
 
       @error_count = 0
-      @metric.set(name: 'reducer_total', value: @count, type: 'counter')
-      @metric.set(name: 'reducer_error_total', value: @error_count, type: 'counter')
+
+      # Initialize metrics
+      @metric.set(name: 'reducer_minute_total', value: 0, type: 'counter')
+      @metric.set(name: 'reducer_hour_total', value: 0, type: 'counter')
+      @metric.set(name: 'reducer_day_total', value: 0, type: 'counter')
+      @metric.set(name: 'reducer_minute_error_total', value: 0, type: 'counter')
+      @metric.set(name: 'reducer_hour_error_total', value: 0, type: 'counter')
+      @metric.set(name: 'reducer_day_error_total', value: 0, type: 'counter')
+      @metric.set(name: 'reducer_minute_processing_sample_seconds', value: 0.0, type: 'gauge', unit: 'seconds')
+      @metric.set(name: 'reducer_hour_processing_sample_seconds', value: 0.0, type: 'gauge', unit: 'seconds')
+      @metric.set(name: 'reducer_day_processing_sample_seconds', value: 0.0, type: 'gauge', unit: 'seconds')
+      @metric.set(name: 'reducer_minute_processing_max_seconds', value: 0.0, type: 'gauge', unit: 'seconds')
+      @metric.set(name: 'reducer_hour_processing_max_seconds', value: 0.0, type: 'gauge', unit: 'seconds')
+      @metric.set(name: 'reducer_day_processing_max_seconds', value: 0.0, type: 'gauge', unit: 'seconds')
     end
 
     def run
@@ -155,41 +170,65 @@ module OpenC3
 
     def metric(name)
       start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-      yield
+      processed = yield
       elapsed = Process.clock_gettime(Process::CLOCK_MONOTONIC) - start # seconds as a float
-      @metric.set(name: name, value: elapsed, type: 'gauge', unit: 'seconds')
+      if processed
+        sample_name = name + '_sample_seconds'
+        @metric.set(name: sample_name, value: elapsed, type: 'gauge', unit: 'seconds')
+        max_name = name + '_max_seconds'
+        previous_max = @previous_metrics[max_name] || 0.0
+        if elapsed > previous_max
+          @metric.set(name: max_name, value: elapsed, type: 'gauge', unit: 'seconds')
+          @previous_metrics[max_name] = elapsed
+        end
+      end
     end
 
     def reduce_minute
-      metric(MINUTE_METRIC) do
-        ReducerModel
-          .all_files(type: :DECOM, target: @target_name, scope: @scope)
-          .each do |file|
-            process_file(file, 'minute', MINUTE_ENTRY_NSECS, MINUTE_FILE_NSECS)
-            ReducerModel.rm_file(file)
+      @mutex.synchronize do
+        metric(MINUTE_METRIC) do
+          processed = false
+          ReducerModel
+            .all_files(type: :DECOM, target: @target_name, scope: @scope)
+            .each do |file|
+              process_file(file, 'minute', MINUTE_ENTRY_NSECS, MINUTE_FILE_NSECS)
+              ReducerModel.rm_file(file)
+              processed = true
           end
+          processed # return to yield
+        end
       end
     end
 
     def reduce_hour
-      metric(HOUR_METRIC) do
-        ReducerModel
-          .all_files(type: :MINUTE, target: @target_name, scope: @scope)
-          .each do |file|
-            process_file(file, 'hour', HOUR_ENTRY_NSECS, HOUR_FILE_NSECS)
-            ReducerModel.rm_file(file)
+      @mutex.synchronize do
+        metric(HOUR_METRIC) do
+          processed = false
+          ReducerModel
+            .all_files(type: :MINUTE, target: @target_name, scope: @scope)
+            .each do |file|
+              process_file(file, 'hour', HOUR_ENTRY_NSECS, HOUR_FILE_NSECS)
+              ReducerModel.rm_file(file)
+              processed = true
           end
+          processed # return to yield
+        end
       end
     end
 
     def reduce_day
-      metric(DAY_METRIC) do
-        ReducerModel
-          .all_files(type: :HOUR, target: @target_name, scope: @scope)
-          .each do |file|
-            process_file(file, 'day', DAY_ENTRY_NSECS, DAY_FILE_NSECS)
-            ReducerModel.rm_file(file)
+      @mutex.synchronize do
+        metric(DAY_METRIC) do
+          processed = false
+          ReducerModel
+            .all_files(type: :HOUR, target: @target_name, scope: @scope)
+            .each do |file|
+              process_file(file, 'day', DAY_ENTRY_NSECS, DAY_FILE_NSECS)
+              ReducerModel.rm_file(file)
+              processed = true
           end
+          processed # return to yield
+        end
       end
     end
 
@@ -197,8 +236,12 @@ module OpenC3
       throttle = OpenC3::Throttle.new(@max_cpu_utilization)
       file = BucketFile.new(filename)
       file.retrieve
-      unless file.local_path
-        @logger.warn("Reducer Warning: #{filename}: Could not be retrieved")
+      unless File.exist?(file.local_path)
+        @logger.warn("Reducer Warning: #{file.local_path}: Does not exist")
+        return
+      end
+      unless File.size(file.local_path) > 0
+        @logger.warn("Reducer Warning: #{file.local_path}: Is zero bytes")
         return
       end
       throttle.throttle_sleep
@@ -270,17 +313,38 @@ module OpenC3
       @logger.debug("Reducer Throttle: #{filename}: total_time: #{Time.now - throttle.reset_time}, sleep_time: #{throttle.total_sleep_time}")
 
       @count += 1
-      @metric.set(name: 'reducer_total', value: @count, type: 'counter')
+      if type == 'minute'
+        metric_name = 'reducer_minute_total'
+      elsif type == 'hour'
+        metric_name = 'reducer_hour_total'
+      else
+        metric_name = 'reducer_day_total'
+      end
+      @previous_metrics[metric_name] ||= 0
+      @previous_metrics[metric_name] += 1
+      @metric.set(name: metric_name, value: @previous_metrics[metric_name], type: 'counter')
 
       true
     rescue => e
       if file.local_path and File.exist?(file.local_path)
-        @logger.error("Reducer Error: #{filename}: #{File.size(file.local_path)} bytes: \n#{e.formatted}")
+        @logger.error("Reducer Error: #{file.local_path}: #{File.size(file.local_path)} bytes: \n#{e.formatted}")
       else
         @logger.error("Reducer Error: #{filename}: \n#{e.formatted}")
       end
+
       @error_count += 1
-      @metric.set(name: 'reducer_error_total', value: @error_count, type: 'counter')
+      if type == 'minute'
+        metric_name = 'reducer_minute_error_total'
+      elsif type == 'hour'
+        metric_name = 'reducer_hour_error_total'
+      else
+        metric_name = 'reducer_day_error_total'
+      end
+      @previous_metrics[metric_name] ||= 0
+      @previous_metrics[metric_name] += 1
+      @metric.set(name: metric_name, value: @previous_metrics[metric_name], type: 'counter')
+
+      file.delete
       false
     end
 

data/lib/openc3/models/auth_model.rb

@@ -26,13 +26,10 @@ require 'openc3/utilities/store'
 module OpenC3
   class AuthModel
     PRIMARY_KEY = 'OPENC3__TOKEN'
-    SERVICE_KEY = 'OPENC3__SERVICE__TOKEN'
 
     TOKEN_CACHE_TIMEOUT = 5
     @@token_cache = nil
     @@token_cache_time = nil
-    @@service_token_cache = nil
-    @@service_token_cache_time = nil
 
     def self.is_set?(key = PRIMARY_KEY)
       Store.exists(key) == 1
@@ -43,20 +40,15 @@ module OpenC3
 
       token_hash = hash(token)
       return true if @@token_cache and (Time.now - @@token_cache_time) < TOKEN_CACHE_TIMEOUT and @@token_cache == token_hash
-      return true if @@service_token_cache and (Time.now - @@service_token_cache_time) < TOKEN_CACHE_TIMEOUT and @@service_token_cache == token_hash and permission != 'admin'
 
       @@token_cache = Store.get(PRIMARY_KEY)
       @@token_cache_time = Time.now
       return true if @@token_cache == token_hash
 
-      @@service_token_cache = Store.get(SERVICE_KEY)
-      @@service_token_cache_time = @@token_cache_time
-      if ENV['OPENC3_SERVICE_PASSWORD'] and hash(ENV['OPENC3_SERVICE_PASSWORD']) != @@service_token_cache
-        set_hash = hash(ENV['OPENC3_SERVICE_PASSWORD'])
-        OpenC3::Store.set(SERVICE_KEY, set_hash)
-        @@service_token_cache = set_hash
-      end
-      return true if @@service_token_cache == token_hash and permission != 'admin'
+      # Handle a service password - Generally only used by ScriptRunner
+      service_password = ENV['OPENC3_SERVICE_PASSWORD']
+      return true if service_password and service_password == token and permission != 'admin'
+
       return false
     end
 

data/lib/openc3/models/target_model.rb

@@ -926,6 +926,7 @@ module OpenC3
         work_dir: '/openc3/lib/openc3/microservices',
         options: [
           ["MAX_CPU_UTILIZATION", @reducer_max_cpu_utilization],
+          ["BUFFER_DEPTH", @tlm_buffer_depth]
         ],
         topics: topics,
         plugin: @plugin,

data/lib/openc3/script/script.rb

@@ -222,7 +222,7 @@ module OpenC3
     # generate the auth object
     def generate_auth
       if ENV['OPENC3_API_TOKEN'].nil? and ENV['OPENC3_API_USER'].nil?
-        if ENV['OPENC3_API_PASSWORD'] || ENV['OPENC3_SERVICE_PASSWORD']
+        if ENV['OPENC3_API_PASSWORD']
           return OpenC3Authentication.new()
         else
           return nil
@@ -260,7 +260,7 @@ module OpenC3
           disconnect = kw_params.delete(:disconnect)
           # The only commands allowed through in disconnect mode are read-only
           # Thus we allow the get, list, tlm and limits_enabled and subscribe methods
-          if method_name =~ /get_\w*|list_\w*|^tlm|limits_enabled|subscribe/
+          if method_name =~ /\w*_get$|^get_\w*|\w*_list$|^list_\w*|^tlm|^limits_enabled$|^subscribe$/
             result = @json_drb.method_missing(method_name, *method_params, **kw_params)
           end
           # If they overrode the return value using the disconnect keyword then return that
@@ -292,7 +292,7 @@ module OpenC3
     # generate the auth object
     def generate_auth
       if ENV['OPENC3_API_TOKEN'].nil? and ENV['OPENC3_API_USER'].nil?
-        if ENV['OPENC3_API_PASSWORD'] || ENV['OPENC3_SERVICE_PASSWORD']
+        if ENV['OPENC3_API_PASSWORD']
           return OpenC3Authentication.new()
         else
           return nil

data/lib/openc3/script/web_socket_api.rb

@@ -161,7 +161,7 @@ module OpenC3
     # Generate the appropriate token for OpenC3
     def generate_auth
       if ENV['OPENC3_API_TOKEN'].nil? and ENV['OPENC3_API_USER'].nil?
-        if ENV['OPENC3_API_PASSWORD'] || ENV['OPENC3_SERVICE_PASSWORD']
+        if ENV['OPENC3_API_PASSWORD']
           return OpenC3Authentication.new()
         else
           raise "Environment Variables Not Set for Authentication"

data/lib/openc3/utilities/authentication.rb

@@ -31,9 +31,9 @@ module OpenC3
   # OpenC3 base / open source authentication code
   class OpenC3Authentication
     def initialize()
-      @token = ENV['OPENC3_API_PASSWORD'] || ENV['OPENC3_SERVICE_PASSWORD']
+      @token = ENV['OPENC3_API_PASSWORD']
       if @token.nil?
-        raise OpenC3AuthenticationError, "Authentication requires environment variables OPENC3_API_PASSWORD or OPENC3_SERVICE_PASSWORD"
+        raise OpenC3AuthenticationError, "Authentication requires environment variable OPENC3_API_PASSWORD"
       end
     end
 

data/lib/openc3/utilities/bucket_file_cache.rb

@@ -68,12 +68,30 @@ class BucketFile
     @topic_prefix = "#{scope}__#{type}__{#{target_name}}"
   end
 
+  # Returns true if the file was retrieved and added to the disk
+  # Returns false if the file already exists
+  # Raises an error on retrieval errors
   def retrieve(client = @bucket, uncompress = true)
     @mutex.synchronize do
       local_path = "#{BucketFileCache.instance.cache_dir}/#{File.basename(@bucket_path)}"
       unless File.exist?(local_path)
         OpenC3::Logger.debug "Retrieving #{@bucket_path} from logs bucket"
-        client.get_object(bucket: ENV['OPENC3_LOGS_BUCKET'], key: @bucket_path, path: local_path)
+
+        retry_count = 0
+        begin
+          client_result = client.get_object(bucket: ENV['OPENC3_LOGS_BUCKET'], key: @bucket_path, path: local_path)
+          unless File.exist?(local_path)
+            raise "Local file does not exist after get_object: #{client_result.inspect}"
+          end
+        rescue => err
+          # Try to retrieve the file three times
+          retry_count += 1
+          raise err if retry_count >= 3
+          Logger.warn("Error retrieving log file from bucket - retry #{retry_count}: #{@bucket_path}\n#{err.formatted}")
+          sleep(1)
+          retry
+        end
+
         if File.exist?(local_path)
           basename = File.basename(local_path)
           if uncompress and File.extname(basename) == ".gz"

data/lib/openc3/version.rb

@@ -1,14 +1,14 @@
 # encoding: ascii-8bit
 
-OPENC3_VERSION = '5.11.0'
+OPENC3_VERSION = '5.11.1'
 module OpenC3
   module Version
     MAJOR = '5'
     MINOR = '11'
-    PATCH = '0'
+    PATCH = '1'
     OTHER = ''
-    BUILD = 'f994eee0c2fadfc67ffbf0865ba798ed11ec1f5c'
+    BUILD = 'b87f91f54de92aa77746d8be150f85d2f3ceeec8'
   end
-  VERSION = '5.11.0'
-  GEM_VERSION = '5.11.0'
+  VERSION = '5.11.1'
+  GEM_VERSION = '5.11.1'
 end

data/templates/tool_angular/package.json

@@ -1,6 +1,6 @@
 {
   "name": "<%= tool_name %>",
-  "version": "5.11.0",
+  "version": "5.11.1",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",
@@ -12,7 +12,7 @@
   },
   "private": true,
   "dependencies": {
-    "@openc3/tool-common": "5.11.0",
+    "@openc3/tool-common": "5.11.1",
     "@angular/animations": "^16.2.4",
     "@angular/cdk": "^16.2.3",
     "@angular/common": "^16.2.4",

data/templates/tool_angular/src/single-spa/single-spa-props.ts

@@ -5,4 +5,4 @@ export const singleSpaPropsSubject = new ReplaySubject<SingleSpaProps>(1);
 
 // Add any custom single-spa props you have to this type def
 // https://single-spa.js.org/docs/building-applications.html#custom-props
-export type SingleSpaProps = AppProps & {};
+export type SingleSpaProps = AppProps; // & {};

data/templates/tool_svelte/package.json

@@ -11,7 +11,7 @@
     "smui-theme": "smui-theme compile build/smui.css -i src/theme"
   },
   "dependencies": {
-    "@openc3/tool-common": "5.11.0",
+    "@openc3/tool-common": "5.11.1",
     "@smui/button": "^7.0.0-beta.15",
     "@smui/card": "^7.0.0-beta.15",
     "@smui/list": "^7.0.0-beta.15",

data/templates/tool_svelte/src/services/config-parser.js

@@ -58,7 +58,7 @@ export class ConfigParserService {
       }
     }
     // If they pass null for max_params we don't check for a maximum number
-    if (max_num_params && !this.parameters[max_num_params] === undefined) {
+    if (max_num_params && this.parameters[max_num_params] !== undefined) {
       throw new ConfigParserError(
         this,
         `Too many parameters for ${this.keyword}.`,

data/templates/tool_vue/package.json

@@ -1,6 +1,6 @@
 {
   "name": "<%= tool_name %>",
-  "version": "5.11.0",
+  "version": "5.11.1",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -11,7 +11,7 @@
     "test:components": "vue-cli-service test:components"
   },
   "dependencies": {
-    "@openc3/tool-common": "5.11.0",
+    "@openc3/tool-common": "5.11.1",
     "axios": "0.27.2",
     "date-fns": "2.30.0",
     "portal-vue": "2.1.7",

data/templates/tool_vue/vue.config.js

@@ -1,4 +1,4 @@
-const path = require("path");
+const path = require('path')
 
 module.exports = {
   publicPath: '/tools/<%= tool_name %>',
@@ -20,11 +20,19 @@ module.exports = {
   },
   configureWebpack: {
     output: {
-      libraryTarget: 'system'
+      libraryTarget: 'system',
     },
   },
   chainWebpack: (config) => {
     config.module.rule('js').use('babel-loader')
+    config.module
+      .rule('vue')
+      .use('vue-loader')
+      .tap((options) => {
+        return {
+          prettify: false,
+        }
+      })
     config.externals(['vue', 'vuetify', 'vuex', 'vue-router'])
   },
 }

data/templates/widget/package.json

@@ -1,12 +1,12 @@
 {
   "name": "widget",
-  "version": "5.11.0",
+  "version": "5.11.1",
   "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.11.0",
+    "@openc3/tool-common": "5.11.1",
     "vue": "2.7.14",
     "vuetify": "2.7.1"
   },

data/templates/widget/vue.config.js

@@ -15,11 +15,14 @@ module.exports = {
           rootMode: 'upward',
         }
       })
-    config.externals([
-      'vue',
-      'vuetify',
-      'vuex',
-      'vue-router',
-    ])
+    config.module
+      .rule('vue')
+      .use('vue-loader')
+      .tap((options) => {
+        return {
+          prettify: false,
+        }
+      })
+    config.externals(['vue', 'vuetify', 'vuex', 'vue-router'])
   },
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openc3
 version: !ruby/object:Gem::Version
-  version: 5.11.0
+  version: 5.11.1
 platform: ruby
 authors:
 - Ryan Melton
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-18 00:00:00.000000000 Z
+date: 2023-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler