openc3 7.2.0 → 7.3.0

data/lib/openc3/utilities/pypi_url.rb

@@ -0,0 +1,39 @@
+# encoding: ascii-8bit
+
+# Copyright 2026 OpenC3, Inc.
+# All Rights Reserved.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See LICENSE.md for more details.
+#
+# This file may also be used under the terms of a commercial license
+# if purchased from OpenC3, Inc.
+
+require 'uri'
+require 'openc3/utilities/logger'
+
+module OpenC3
+  class PypiUrl
+    DEFAULT = 'https://pypi.org/simple'
+
+    # Validate that a resolved pypi_url is an http(s) URL before it is handed to
+    # pip. The value can come from a user-writable setting or ENV, so a malformed
+    # or non-http value is rejected and replaced with the default rather than
+    # passed through to pip.
+    #
+    # @param pypi_url [String] the resolved pypi index url to validate
+    # @return [String] the original url if valid, otherwise DEFAULT
+    def self.validate(pypi_url)
+      uri = URI.parse(pypi_url)
+      unless uri.is_a?(URI::HTTP) && !uri.host.to_s.empty?
+        raise URI::InvalidURIError, "not an http(s) URL"
+      end
+      pypi_url
+    rescue URI::InvalidURIError => e
+      Logger.error("Invalid pypi_url '#{pypi_url}' (#{e.message}); falling back to #{DEFAULT}")
+      DEFAULT
+    end
+  end
+end

data/lib/openc3/utilities/reingest_job.rb

@@ -1,4 +1,4 @@
-# encoding: ascii-8bit
+# encoding: utf-8
 
 # Copyright 2026 OpenC3, Inc.
 # All Rights Reserved.

data/lib/openc3/utilities/ruby_lex_utils.rb

@@ -94,7 +94,11 @@ And so is this
       # of the file and process the last line
       if next_token.type == :EOF
         if !line.empty?
-          yield line, instrumentable, inside_begin, orig_line_no
+          # orig_line_no is normally set below (after this EOF check) but a final
+          # line that never reaches that assignment (e.g. a trailing bareword call
+          # with no parentheses and no newline at end of file) would yield nil.
+          # Fall back to the current token's start line so the line number is valid.
+          yield line, instrumentable, inside_begin, orig_line_no || token.location.start_line
         end
         break
       end

data/lib/openc3/utilities/running_script.rb

@@ -432,7 +432,7 @@ class RunningScript
     self.class.message_log
   end
 
-  def self.spawn(scope, name, suite_runner = nil, disconnect = false, environment = nil, user_full_name = nil, username = nil, line_no = nil, end_line_no = nil)
+  def self.spawn(scope, name, suite_runner = nil, disconnect = false, environment = nil, user_full_name = nil, username = nil, line_no = nil, end_line_no = nil, python_venv = nil)
     extension = File.extname(name).to_s.downcase
     script_engine = nil
     if extension == '.py'
@@ -468,103 +468,158 @@ class RunningScript
     user_full_name ||= 'Anonymous'
     start_time = Time.now.utc.iso8601
 
-    process = ChildProcess.build(process_name, runner_path.to_s, running_script_id.to_s, scope)
-    process.io.inherit! # Helps with debugging
-    script_cwd = File.join(RAILS_ROOT, 'tmp', "script_#{running_script_id}")
-    FileUtils.mkdir_p(script_cwd)
-    process.cwd = script_cwd
-
-    # Check for offline access token
-    model = nil
-    model = OpenC3::OfflineAccessModel.get_model(name: username, scope: scope) if username != 'Anonymous'
-
-    # Load the global environment variables
-    status_environment = {}
-    values = OpenC3::EnvironmentModel.all(scope: scope).values
-    values.each do |env|
-      process.environment[env['key']] = env['value']
-      status_environment[env['key']] = env['value']
-    end
-    # Load the script specific ENV vars set by the GUI
-    # These can override the previously defined global env vars
-    if environment
-      environment.each do |env|
+    begin
+      process = ChildProcess.build(process_name, runner_path.to_s, running_script_id.to_s, scope)
+      process.io.inherit! # Helps with debugging
+      script_cwd = File.join(RAILS_ROOT, 'tmp', "script_#{running_script_id}")
+      FileUtils.mkdir_p(script_cwd)
+      process.cwd = script_cwd
+
+      # Check for offline access token
+      model = nil
+      model = OpenC3::OfflineAccessModel.get_model(name: username, scope: scope) if username != 'Anonymous'
+
+      # Load the global environment variables
+      status_environment = {}
+      values = OpenC3::EnvironmentModel.all(scope: scope).values
+      values.each do |env|
         process.environment[env['key']] = env['value']
         status_environment[env['key']] = env['value']
       end
-    end
+      # Load the script specific ENV vars set by the GUI
+      # These can override the previously defined global env vars
+      if environment
+        environment.each do |env|
+          process.environment[env['key']] = env['value']
+          status_environment[env['key']] = env['value']
+        end
+      end
 
-    script_status = OpenC3::ScriptStatusModel.new(
-      name: running_script_id.to_s, # Unique id for this script
-      state: 'spawning', # State will be spawning until the script is running
-      shard: 0, # Future enhancement of script runner shards
-      filename: name, # Initial filename never changes
-      current_filename: name, # Current filename updates while we are running
-      line_no: 0, # 0 means not running yet
-      start_line_no: line_no || 1, # Line number to start running the script
-      end_line_no: end_line_no || nil, # Line number to stop running the script
-      username: username, # username of the person who started the script
-      user_full_name: user_full_name, # full name of the person who started the script
-      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, # 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
-      updated_at: nil, # Set by create/update - ISO format
-      scope: scope # Scope of the script
-    )
-    script_status.create(isoformat: true)
-
-    # Set proper secrets for running script
-    process.environment['SECRET_KEY_BASE'] = nil
-    process.environment['OPENC3_REDIS_USERNAME'] = ENV['OPENC3_SR_REDIS_USERNAME']
-    process.environment['OPENC3_REDIS_PASSWORD'] = ENV['OPENC3_SR_REDIS_PASSWORD']
-    process.environment['OPENC3_BUCKET_USERNAME'] = ENV['OPENC3_SR_BUCKET_USERNAME']
-    process.environment['OPENC3_BUCKET_PASSWORD'] = ENV['OPENC3_SR_BUCKET_PASSWORD']
-    process.environment['OPENC3_SR_REDIS_USERNAME'] = nil
-    process.environment['OPENC3_SR_REDIS_PASSWORD'] = nil
-    process.environment['OPENC3_SR_BUCKET_USERNAME'] = nil
-    process.environment['OPENC3_SR_BUCKET_PASSWORD'] = nil
-    process.environment['OPENC3_API_CLIENT'] = ENV['OPENC3_API_CLIENT']
-    if model and model.offline_access_token
-      auth = OpenC3::OpenC3KeycloakAuthentication.new(ENV['OPENC3_KEYCLOAK_URL'])
-      valid_token = auth.get_token_from_refresh_token(model.offline_access_token)
-      if valid_token
-        process.environment['OPENC3_API_TOKEN'] = model.offline_access_token
+      script_status = OpenC3::ScriptStatusModel.new(
+        name: running_script_id.to_s, # Unique id for this script
+        state: 'spawning', # State will be spawning until the script is running
+        shard: 0, # Future enhancement of script runner shards
+        filename: name, # Initial filename never changes
+        current_filename: name, # Current filename updates while we are running
+        line_no: 0, # 0 means not running yet
+        start_line_no: line_no || 1, # Line number to start running the script
+        end_line_no: end_line_no || nil, # Line number to stop running the script
+        username: username, # username of the person who started the script
+        user_full_name: user_full_name, # full name of the person who started the script
+        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, # 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
+        updated_at: nil, # Set by create/update
+        scope: scope # Scope of the script
+      )
+      script_status.create()
+
+      # Set proper secrets for running script
+      process.environment['SECRET_KEY_BASE'] = nil
+      process.environment['OPENC3_REDIS_USERNAME'] = ENV['OPENC3_SR_REDIS_USERNAME']
+      process.environment['OPENC3_REDIS_PASSWORD'] = ENV['OPENC3_SR_REDIS_PASSWORD']
+      process.environment['OPENC3_BUCKET_USERNAME'] = ENV['OPENC3_SR_BUCKET_USERNAME']
+      process.environment['OPENC3_BUCKET_PASSWORD'] = ENV['OPENC3_SR_BUCKET_PASSWORD']
+      process.environment['OPENC3_SR_REDIS_USERNAME'] = nil
+      process.environment['OPENC3_SR_REDIS_PASSWORD'] = nil
+      process.environment['OPENC3_SR_BUCKET_USERNAME'] = nil
+      process.environment['OPENC3_SR_BUCKET_PASSWORD'] = nil
+      process.environment['OPENC3_API_CLIENT'] = ENV['OPENC3_API_CLIENT']
+      if model and model.offline_access_token
+        auth = OpenC3::OpenC3KeycloakAuthentication.new(ENV['OPENC3_KEYCLOAK_URL'])
+        valid_token = auth.get_token_from_refresh_token(model.offline_access_token)
+        if valid_token
+          process.environment['OPENC3_API_TOKEN'] = model.offline_access_token
+        else
+          model.offline_access_token = nil
+          model.update
+          raise "offline_access token invalid for script"
+        end
       else
-        model.offline_access_token = nil
-        model.update
-        raise "offline_access token invalid for script"
+        process.environment['OPENC3_API_USER'] = ENV['OPENC3_API_USER']
+        if ENV['OPENC3_SERVICE_PASSWORD']
+          process.environment['OPENC3_API_PASSWORD'] = ENV['OPENC3_SERVICE_PASSWORD']
+        else
+          raise "No authentication available for script"
+        end
       end
-    else
-      process.environment['OPENC3_API_USER'] = ENV['OPENC3_API_USER']
-      if ENV['OPENC3_SERVICE_PASSWORD']
-        process.environment['OPENC3_API_PASSWORD'] = ENV['OPENC3_SERVICE_PASSWORD']
+      process.environment['GEM_HOME'] = ENV['GEM_HOME']
+
+      # Resolve the per-plugin Python venv for this script. For saved scripts
+      # we look up which plugin owns the target and check whether that plugin
+      # has an isolated UV venv. For temp scripts the frontend can pass a
+      # python_venv name directly, skipping the target lookup entirely.
+      python_venv_dir = nil
+      begin
+        target_name = name.split('/')[0].to_s.upcase
+        if target_name == '__TEMP__' && python_venv
+          # File.basename prevents path traversal (strips directory components)
+          safe_name = File.basename(python_venv.to_s)
+          candidate = "/gems/plugin_venvs/#{safe_name}/.venv"
+          python_venv_dir = candidate if File.directory?(candidate)
+        else
+          target_info = OpenC3::TargetModel.get(name: target_name, scope: scope)
+          if target_info && target_info['plugin']
+            sanitized_name = "#{scope}__#{target_info['plugin']}".tr('^a-zA-Z0-9_-', '_')
+            candidate = "/gems/plugin_venvs/#{sanitized_name}/.venv"
+            python_venv_dir = candidate if File.directory?(candidate)
+          end
+        end
+      rescue => e
+        OpenC3::Logger.debug("Could not resolve plugin venv for script '#{name}': #{e.message}")
+      end
+
+      if python_venv_dir
+        process.environment['VIRTUAL_ENV'] = python_venv_dir
+        process.environment['PATH'] = "#{python_venv_dir}/bin:#{ENV.fetch('PATH', '')}"
+        process.environment['PYTHONUSERBASE'] = python_venv_dir
+        # Add plugin venv site-packages to PYTHONPATH so the base venv's Python
+        # binary can find plugin-specific packages. PYTHONPATH is always respected
+        # by CPython regardless of venv activation state.
+        site_packages = Dir.glob("#{python_venv_dir}/lib/python*/site-packages").first
+        existing_pythonpath = ENV.fetch('PYTHONPATH', '')
+        if site_packages
+          process.environment['PYTHONPATH'] = existing_pythonpath.empty? ? site_packages : "#{site_packages}:#{existing_pythonpath}"
+        else
+          process.environment['PYTHONPATH'] = existing_pythonpath.empty? ? nil : existing_pythonpath
+        end
       else
-        raise "No authentication available for script"
+        system_venv = File.dirname(ENV['OPENC3_PYTHON_BIN'] || '/openc3/python/.venv/bin/python').chomp('/bin')
+        process.environment['VIRTUAL_ENV'] = system_venv
+        process.environment['PYTHONUSERBASE'] = ENV['PYTHONUSERBASE']
+        process.environment['PYTHONPATH'] = ENV['PYTHONPATH']
       end
-    end
-    process.environment['GEM_HOME'] = ENV['GEM_HOME']
-    process.environment['PYTHONUSERBASE'] = ENV['PYTHONUSERBASE']
-    # Preserve PYTHONPATH to ensure Python can find both UV venv and user packages
-    process.environment['PYTHONPATH'] = ENV['PYTHONPATH']
-
-    # Spawned process should not be controlled by same Bundler constraints as spawning process
-    ENV.each do |key, _value|
-      if key =~ /^BUNDLE/
-        process.environment[key] = nil
+
+      # Spawned process should not be controlled by same Bundler constraints as spawning process
+      ENV.each do |key, _value|
+        if key =~ /^BUNDLE/
+          process.environment[key] = nil
+        end
       end
-    end
-    process.environment['RUBYOPT'] = nil # Removes loading bundler setup
-    process.environment['OPENC3_SCOPE'] = scope
-    process.environment['RAILS_ROOT'] = RAILS_ROOT
+      process.environment['RUBYOPT'] = nil # Removes loading bundler setup
+      process.environment['OPENC3_SCOPE'] = scope
+      process.environment['RAILS_ROOT'] = RAILS_ROOT
 
-    process.detach = true
-    process.start
-    running_script_id
+      process.detach = true
+      process.start
+      running_script_id
+    rescue => e
+      begin
+        # Clean up the orphaned script status record so the script
+        # does not remain stuck in 'spawning' state forever.
+        # Guard against nil in case the error occurred before these were assigned.
+        script_status.destroy() if script_status
+        FileUtils.rm_rf(script_cwd) if script_cwd
+      rescue => cleanup_error
+        OpenC3::Logger.error("Failed to cleanup after spawn failure: #{cleanup_error.message}")
+      end
+      raise e
+    end
   end
 
   def initialize(script_status)
@@ -601,7 +656,7 @@ class RunningScript
 
     # Retrieve file
     @body = ::Script.body(@script_status.scope, @script_status.filename)
-    raise "Script not found: #{@script_status.filename}" if @body.nil?
+    raise "Script not found during initialization: #{@script_status.filename}" if @body.nil?
     breakpoints = @@breakpoints[@script_status.filename]&.filter { |_, present| present }&.map { |line_number, _| line_number - 1 } # -1 because frontend lines are 0-indexed
     breakpoints ||= []
     running_script_anycable_publish("running-script-channel:#{@script_status.id}", { type: :file, filename: @script_status.filename, scope: @script_status.scope, text: @body.to_utf8, breakpoints: breakpoints })
@@ -827,17 +882,22 @@ class RunningScript
 
   def run
     if @script_status.suite_runner
-      if @script_status.suite_runner['options']
-        parse_options(@script_status.suite_runner['options'])
-      else
-        parse_options({}) # Set default options
-      end
-      if @script_status.suite_runner['script']
-        run_text("OpenC3::SuiteRunner.start(#{@script_status.suite_runner['suite']}, #{@script_status.suite_runner['group']}, '#{@script_status.suite_runner['script']}')", initial_filename: "SCRIPTRUNNER")
-      elsif script_status.suite_runner['group']
-        run_text("OpenC3::SuiteRunner.#{@script_status.suite_runner['method']}(#{@script_status.suite_runner['suite']}, #{@script_status.suite_runner['group']})", initial_filename: "SCRIPTRUNNER")
+      # Normalize the received hash through the shared helper so options/method
+      # defaults and validation match what openc3cli and the GUI construct.
+      sr = OpenC3::SuiteRunner.build_options(
+        suite: @script_status.suite_runner['suite'],
+        group: @script_status.suite_runner['group'],
+        script: @script_status.suite_runner['script'],
+        method: @script_status.suite_runner['method'],
+        options: @script_status.suite_runner['options'],
+      )
+      parse_options(sr['options'])
+      if sr['script']
+        run_text("OpenC3::SuiteRunner.start(#{sr['suite']}, #{sr['group']}, '#{sr['script']}')", initial_filename: "SCRIPTRUNNER")
+      elsif sr['group']
+        run_text("OpenC3::SuiteRunner.#{sr['method']}(#{sr['suite']}, #{sr['group']})", initial_filename: "SCRIPTRUNNER")
       else
-        run_text("OpenC3::SuiteRunner.#{@script_status.suite_runner['method']}(#{@script_status.suite_runner['suite']})", initial_filename: "SCRIPTRUNNER")
+        run_text("OpenC3::SuiteRunner.#{sr['method']}(#{sr['suite']})", initial_filename: "SCRIPTRUNNER")
       end
     else
       if not @script_engine and (@script_status.start_line_no != 1 or !@script_status.end_line_no.nil?)
@@ -1471,7 +1531,7 @@ class RunningScript
       running_script_anycable_publish("running-script-channel:#{@script_status.id}", { type: :file, filename: filename, text: @body.to_utf8, breakpoints: breakpoints })
     else
       text = ::Script.body(@script_status.scope, filename)
-      raise "Script not found: #{filename}" if text.nil?
+      raise "Script not found during load/require: #{filename}" if text.nil?
       @@file_cache[filename] = text
       @body = text
       running_script_anycable_publish("running-script-channel:#{@script_status.id}", { type: :file, filename: filename, text: @body.to_utf8, breakpoints: breakpoints })

data/lib/openc3/utilities/script.rb

@@ -25,33 +25,69 @@ require 'openc3/tools/test_runner/test'
 OpenC3.require_file 'openc3/utilities/store'
 
 class Script < OpenC3::TargetFile
+  # Script lifecycle states and the transitions allowed from each state
+  LIFECYCLE_STATES = %w(development review approved)
+  LIFECYCLE_TRANSITIONS = {
+    'development' => %w(review approved),
+    'review' => %w(development approved),
+    'approved' => %w(review development),
+  }
+
   def self.all(scope, target = nil)
     super(scope, nil, target: target) # No path matchers
   end
 
+  # Split off the '*' that indicates a file is modified on the server
+  def self.strip_modified(name)
+    name.split('*')[0]
+  end
+  private_class_method :strip_modified
+
   def self.lock(scope, name, username)
-    name = name.split('*')[0] # Split '*' that indicates modified
-    OpenC3::Store.hset("#{scope}__script-locks", name, username)
+    OpenC3::Store.hset("#{scope}__script-locks", strip_modified(name), username)
   end
 
   def self.unlock(scope, name)
-    name = name.split('*')[0] # Split '*' that indicates modified
-    OpenC3::Store.hdel("#{scope}__script-locks", name)
+    OpenC3::Store.hdel("#{scope}__script-locks", strip_modified(name))
   end
 
   def self.locked?(scope, name)
-    name = name.split('*')[0] # Split '*' that indicates modified
-    locked_by = OpenC3::Store.hget("#{scope}__script-locks", name)
+    locked_by = OpenC3::Store.hget("#{scope}__script-locks", strip_modified(name))
     locked_by ||= false
     locked_by
   end
 
   def self.get_breakpoints(scope, name)
-    breakpoints = OpenC3::Store.hget("#{scope}__script-breakpoints", name.split('*')[0]) # Split '*' that indicates modified
+    breakpoints = OpenC3::Store.hget("#{scope}__script-breakpoints", strip_modified(name))
     return JSON.parse(breakpoints, allow_nan: true, create_additions: true) if breakpoints
     []
   end
 
+  def self.temp_file?(name)
+    strip_modified(name).start_with?("#{TEMP_FOLDER}/")
+  end
+
+  def self.lifecycle_enabled?
+    defined?(::VersionStore) && ::VersionStore.enabled?
+  end
+
+  def self.lifecycle(scope, name)
+    return { 'state' => 'development', 'history' => [] } if temp_file?(name)
+    return { 'state' => 'development', 'history' => [] } unless lifecycle_enabled?
+    ::VersionStore.lifecycle(scope: scope, name: strip_modified(name))
+  end
+
+  # current: the caller-known current state; pass it to avoid a redundant git
+  # read when the controller has already fetched it for transition validation.
+  def self.set_lifecycle(scope, name, state, username, comment, current: nil)
+    raise "Cannot set lifecycle on temporary files" if temp_file?(name)
+    raise "Script lifecycle requires the version history store" unless lifecycle_enabled?
+    name = strip_modified(name)
+    current ||= lifecycle(scope, name)['state']
+    ::VersionStore.set_lifecycle(scope: scope, name: name, from: current, to: state,
+                                 username: username, comment: comment)
+  end
+
   def self.process_suite(name, contents, new_process: true, username: nil, scope:)
     python = false
     python = true if File.extname(name) == '.py'
@@ -139,16 +175,23 @@ class Script < OpenC3::TargetFile
       process.io.stdout = stdout
       process.io.stderr = stderr
       process.start
-      process.wait
+      begin
+        process.poll_for_exit(10) # wait for max 10s
+      rescue ChildProcess::TimeoutError
+        process.stop
+        stderr_results = "Suite analysis timed out - possible infinite loop in script\n"
+        success = false
+      end
       stdout.rewind
       stdout_results = stdout.read
       stdout.close
       stdout.unlink
       stderr.rewind
-      stderr_results = stderr.read
+      stderr_results ||= ""
+      stderr_results += stderr.read
       stderr.close
       stderr.unlink
-      success = process.exit_code == 0
+      success = process.exit_code == 0 if success
     else
       require temp.path
       stdout_results = OpenC3::SuiteRunner.build_suites.as_json().to_json(allow_nan: true)
@@ -182,7 +225,6 @@ class Script < OpenC3::TargetFile
   def self.delete_temp(scope)
     files = super(scope)
     files.each do |name|
-      # Remove any breakpoints associated with the temp files
       OpenC3::Store.hdel("#{scope}__script-breakpoints", "#{TEMP_FOLDER}/#{File.basename(name)}")
     end
   end
@@ -201,9 +243,14 @@ class Script < OpenC3::TargetFile
     user_full_name = nil,
     username = nil,
     line_no = nil,
-    end_line_no = nil
+    end_line_no = nil,
+    python_venv = nil
   )
-    RunningScript.spawn(scope, name, suite_runner, disconnect, environment, user_full_name, username, line_no, end_line_no)
+    # Verify the script exists before spawning a run. Without this check a run
+    # is started and the missing file only surfaces as a runtime error inside
+    # the spawned process. Returning nil lets the caller return a 404.
+    return nil unless Script.body(scope, name)
+    RunningScript.spawn(scope, name, suite_runner, disconnect, environment, user_full_name, username, line_no, end_line_no, python_venv)
   end
 
   def self.instrumented(filename, text)

data/lib/openc3/utilities/store_autoload.rb

@@ -123,8 +123,46 @@ module OpenC3
       @redis_pool = StoreConnectionPool.new(size: pool_size) { build_redis() }
     end
 
+    # cap/base for the equal-jitter reconnect backoff (seconds)
+    REDIS_BACKOFF_CAP = 5.0
+    REDIS_BACKOFF_BASE = 0.625
+
     def build_redis
-      return Redis.new(url: @redis_url, username: @redis_username, password: @redis_key)
+      # reconnect_attempts retries the connection a few times with equal-jitter
+      # backoff so a transient network blip is handled inside the client instead
+      # of immediately surfacing a connection error to callers. The jitter
+      # de-syncs many clients retrying the same blip to avoid a thundering herd
+      # on recovery.
+      #
+      # This mirrors the Python store's Retry(EqualJitterBackoff(cap: 5, base:
+      # 0.625), 3): per-retry backoff tops out at 5s on the final (3rd) retry
+      # (~0.6-1.25s, ~1.25-2.5s, ~2.5-5s). redis-rb takes a fixed Array of delays
+      # (no per-failure backoff callable), so we sample the jittered delays once
+      # per connection here.
+      # Connection, read, and write timeouts are left as the default: 1s
+      return Redis.new(
+        url: @redis_url,
+        username: @redis_username,
+        password: @redis_key,
+        reconnect_attempts: reconnect_backoff_delays()
+      )
+    end
+
+    # Equal-jitter backoff delays for 3 retries, matching Python's
+    # EqualJitterBackoff. Each retry's delay is randomized within the upper half
+    # of an exponentially-growing ceiling.
+    def reconnect_backoff_delays
+      (1..3).map do |failures|
+        # ceiling = exponential growth (base doubles each retry), clamped to cap.
+        # For base=0.625, cap=5: failures 1,2,3 -> 1.25, 2.5, 5.0 seconds.
+        # temp = half the ceiling: the guaranteed minimum wait for this retry.
+        temp = [REDIS_BACKOFF_CAP, REDIS_BACKOFF_BASE * (2 ** failures)].min / 2.0
+        # Final delay = fixed half (temp) + random half (rand*temp, in [0, temp)),
+        # i.e. a value uniformly in [temp, 2*temp) = [ceiling/2, ceiling).
+        # The fixed half keeps a sane floor; the random half de-syncs clients so
+        # they don't all reconnect in lockstep (thundering herd) after a blip.
+        temp + rand * temp
+      end
     end
 
     ###########################################################################

data/lib/openc3/utilities/store_queued.rb

@@ -103,7 +103,11 @@ module OpenC3
       OpenC3.kill_thread(self, @update_thread) if @update_thread
       @update_thread = nil
       # Drain the queue before shutdown
-      process_queue()
+      begin
+        process_queue()
+      rescue
+        # Best effort - Redis may already be unavailable during shutdown
+      end
     end
 
     MessageStruct = Struct.new(:message, :args, :kwargs, :block)

data/lib/openc3/version.rb

@@ -1,14 +1,14 @@
 # encoding: ascii-8bit
 
-OPENC3_VERSION = '7.2.0'
+OPENC3_VERSION = '7.3.0'
 module OpenC3
   module Version
     MAJOR = '7'
-    MINOR = '2'
+    MINOR = '3'
     PATCH = '0'
     OTHER = ''
-    BUILD = '57bc6819061782287e6e4c866874e13853dc6b40'
+    BUILD = 'ec6ac203728234fada5e3a2ecab59fba8a94b935'
   end
-  VERSION = '7.2.0'
-  GEM_VERSION = '7.2.0'
+  VERSION = '7.3.0'
+  GEM_VERSION = '7.3.0'
 end

data/lib/openc3.rb

@@ -19,7 +19,12 @@ require 'resolv-replace'
 # Set default encodings
 saved_verbose = $VERBOSE; $VERBOSE = nil
 Encoding.default_external = Encoding::ASCII_8BIT
-Encoding.default_internal = Encoding::ASCII_8BIT
+# NOTE: Do NOT set Encoding.default_internal = ASCII_8BIT. Doing so makes every
+# read that specifies an encoding (e.g. File.read(path, encoding: 'UTF-8'))
+# transcode into ASCII-8BIT, which raises Encoding::UndefinedConversionError on
+# any non-ASCII byte. On Ruby 3.4 this breaks bootsnap's compile cache (it reads
+# source as UTF-8 to work around Ruby bug #22023) for any file containing
+# non-ASCII characters, including stdlib files like 'matrix'. Leave it nil.
 $VERBOSE = saved_verbose
 
 # Add OpenC3 bin folder to PATH

data/templates/plugin/plugin.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.files = Dir.glob("{targets,lib,public,tools,microservices}/**/*") + %w(Rakefile README.md LICENSE.md plugin.txt)
 
   s.metadata = {
-    # These fields are used when you submit your plugin to our App Store at store.openc3.com
+    # These fields are used when you submit your plugin to the OpenC3 Store at store.openc3.com
     # See this help page for more detail: https://store.openc3.com/help/guidelines
     "source_code_uri" => "https://github.com/your-github/plugin-repo",
     "openc3_store_title" => "<%= plugin_orig %>",

data/templates/tool_angular/package.json

@@ -1,6 +1,6 @@
 {
   "name": "<%= tool_name %>",
-  "version": "7.2.0",
+  "version": "7.3.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": "7.2.0",
+    "@openc3/js-common": "7.3.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": "7.2.0",
+    "@openc3/js-common": "7.3.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": "7.2.0",
+    "@openc3/js-common": "7.3.0",
     "@smui/button": "^7.0.0",
     "@smui/common": "^7.0.0",
     "@smui/card": "^7.0.0",