openc3 6.9.0 → 6.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e31ed59341fe02adf738c1773ca991bf2045fdccc994c4fa9e496aa22930e3d0
-  data.tar.gz: 9822897cdff34db69b3975cfce8b256a84410b579df7944c485097c767990344
+  metadata.gz: 4d4fd7006c78d3a21531579d68d42bc5cba596c92091e8cd7895c4b42ecff569
+  data.tar.gz: 85fdaa738dafbfafcc16fb463abb5d86517f9f1edefb4bbef9a5e7171738211c
 SHA512:
-  metadata.gz: b3597ed6dc60b66d41138a196bb26c95abe6d54527754e477f741e32e9529607de2f51d59491f58798b3eff2fa7dde717a94f11825eaeef2db629be9214e3f9a
-  data.tar.gz: ba3bb00eeeb33b57534ce80c78d1c1d78ccc789dcd14525699b9797b0b58dfa77e873cda843dc06101be77e78cf89aa80cccd83730a4069ed966d8ed247519eb
+  metadata.gz: 419ddee4f6203f3500c9d3eb45347824dfa57a074527086fd8bfdaee16c4dc10ec07b3b78122e1a753a064913bbb1193f29344e260ba7a04b029cdb11682a9e7
+  data.tar.gz: 961d67c9c972a2cdf60c31c9279b69a7e1fc315e62813935eb66fefbbd853cf931c633c36aa6b9606cb1eedfd66ef8ba2db07b34f24acf99967aa6983755deb3

data/bin/openc3cli

@@ -875,6 +875,22 @@ if not ARGV[0].nil? # argument(s) given
   case ARGV[0].downcase
 
   when 'irb'
+    if ARGV[1] == '--help' || ARGV[1] == '-h'
+      puts "Usage: cli irb"
+      puts ""
+      puts "Start an interactive Ruby (IRB) session with COSMOS libraries loaded"
+      puts ""
+      puts "This provides access to all COSMOS classes and methods for interactive"
+      puts "debugging and exploration. Use 'exit' or Ctrl-D to quit the IRB session."
+      puts ""
+      puts "Example:"
+      puts "  cli irb"
+      puts "  > require 'openc3'"
+      puts "  > OpenC3::System.targets"
+      puts ""
+      puts "Note: For IRB-specific options, start IRB first then type 'help'"
+      exit 0
+    end
     ARGV.clear
     IRB.start
 
@@ -882,6 +898,29 @@ if not ARGV[0].nil? # argument(s) given
     cli_script(ARGV[1..-1])
 
   when 'rake'
+    # Check for --help first, before checking for Rakefile
+    if ARGV[1] == '--help' || ARGV[1] == '-h'
+      puts "Usage: cli rake [RAKE_OPTIONS] [TASKS...]"
+      puts ""
+      puts "Run rake tasks in the current directory"
+      puts ""
+      puts "This runs the standard Ruby rake tool with all COSMOS libraries available."
+      puts "A Rakefile must exist in the current directory."
+      puts ""
+      puts "Common rake options:"
+      puts "  -T, --tasks              List all available rake tasks with descriptions"
+      puts "  -D, --describe PATTERN   Describe tasks matching PATTERN"
+      puts "  -h, --help               Show rake's full help message"
+      puts ""
+      puts "Examples:"
+      puts "  cli rake -T              # List all available tasks"
+      puts "  cli rake build           # Run the 'build' task"
+      puts "  cli rake test            # Run tests"
+      puts ""
+      puts "Note: Must be run in a directory containing a Rakefile"
+      exit 0
+    end
+    # Now check for Rakefile existence
     if File.exist?('Rakefile')
       puts `rake #{ARGV[1..-1].join(' ')}`
     else
@@ -889,9 +928,70 @@ if not ARGV[0].nil? # argument(s) given
     end
 
   when 'validate'
+    if ARGV[1].nil? || ARGV[1] == '--help' || ARGV[1] == '-h'
+      puts "Usage: cli validate PLUGIN.gem [SCOPE] [VARIABLES.json]"
+      puts ""
+      puts "Validate a COSMOS plugin gem file"
+      puts ""
+      puts "Arguments:"
+      puts "  PLUGIN.gem        Plugin gem file to validate (required)"
+      puts "  SCOPE             Scope for validation (optional, default: DEFAULT)"
+      puts "  VARIABLES.json    Variables JSON file (optional)"
+      puts ""
+      puts "Options:"
+      puts "  -h, --help        Show this help message"
+      exit(ARGV[1].nil? ? 1 : 0)
+    end
     validate_plugin(ARGV[1], scope: ARGV[2], variables_file: ARGV[3])
 
   when 'load'
+    # Check for help flag or missing arguments
+    if ARGV[1].nil? || ARGV[1] == '--help' || ARGV[1] == '-h'
+      puts "Usage:"
+      puts "  cli load PLUGIN.gem"
+      puts "  cli load PLUGIN.gem --variables VARIABLES.json"
+      puts "  cli load PLUGIN.gem SCOPE PLUGIN_HASH.json [force]"
+      puts "  cli load PLUGIN.gem --variables VARIABLES.json SCOPE PLUGIN_HASH.json [force]"
+      puts ""
+      puts "Load a COSMOS plugin gem file"
+      puts ""
+      puts "Common Usage (Auto-detect):"
+      puts "  cli load PLUGIN.gem"
+      puts "    - Installs new plugin in DEFAULT scope"
+      puts "    - Automatically detects and upgrades if plugin already exists"
+      puts "    - Skips installation if same version already installed"
+      puts ""
+      puts "  cli load PLUGIN.gem --variables VARIABLES.json"
+      puts "    - Same as above, but provides variables for plugin configuration"
+      puts ""
+      puts "Advanced Usage (Manual Control):"
+      puts "  cli load PLUGIN.gem SCOPE PLUGIN_HASH.json [force]"
+      puts "    - Used by Admin UI for plugin create/edit/upgrade operations"
+      puts "    - Requires PLUGIN_HASH.json (output from install_phase1)"
+      puts "    - 'force' argument forces reinstall even if version unchanged"
+      puts ""
+      puts "Arguments:"
+      puts "  PLUGIN.gem           Plugin gem file to load (required)"
+      puts "  SCOPE                Scope to install plugin in (default: DEFAULT)"
+      puts "  PLUGIN_HASH.json     Plugin hash JSON file from install_phase1 (optional)"
+      puts "  force                Force plugin installation even if no changes (optional)"
+      puts ""
+      puts "Options:"
+      puts "  --variables FILE     Variables JSON file for plugin installation"
+      puts "  -h, --help           Show this help message"
+      puts ""
+      puts "IMPORTANT LIMITATION:"
+      puts "  To specify SCOPE without PLUGIN_HASH.json, you must use the --variables"
+      puts "  option (even with an empty JSON file) to prevent argument misinterpretation."
+      puts ""
+      puts "Examples:"
+      puts "  cli load my-plugin-1.0.0.gem"
+      puts "  cli load my-plugin-1.0.0.gem --variables vars.json"
+      puts "  cli load my-plugin-1.0.0.gem DEFAULT plugin_hash.json"
+      puts "  cli load my-plugin-1.0.0.gem DEFAULT plugin_hash.json force"
+      exit(ARGV[1].nil? ? 1 : 0)
+    end
+
     # force is a boolean so if they pass 'force' it is true
     # See plugins_controller.rb install for usage
     variables_option = ARGV.find_index('--variables')
@@ -908,15 +1008,68 @@ if not ARGV[0].nil? # argument(s) given
     load_plugin(ARGV[1], scope: scope, plugin_hash_file: plugin_hash_file, force: force, variables_file: variables_file)
 
   when 'list'
+    if ARGV[1] == '--help' || ARGV[1] == '-h'
+      puts "Usage: cli list [SCOPE]"
+      puts ""
+      puts "List all installed plugins in the specified scope"
+      puts ""
+      puts "Arguments:"
+      puts "  SCOPE             Scope to list plugins from (optional, default: DEFAULT)"
+      puts ""
+      puts "Options:"
+      puts "  -h, --help        Show this help message"
+      exit 0
+    end
     list_plugins(scope: ARGV[1])
 
   when 'unload'
+    if ARGV[1].nil? || ARGV[1] == '--help' || ARGV[1] == '-h'
+      puts "Usage: cli unload PLUGIN_NAME [SCOPE]"
+      puts ""
+      puts "Unload a COSMOS plugin"
+      puts ""
+      puts "Arguments:"
+      puts "  PLUGIN_NAME       Name of the plugin to unload (required)"
+      puts "  SCOPE             Scope to unload from (optional, default: DEFAULT)"
+      puts ""
+      puts "Options:"
+      puts "  -h, --help        Show this help message"
+      exit(ARGV[1].nil? ? 1 : 0)
+    end
     unload_plugin(ARGV[1], scope: ARGV[2])
 
   when 'pkginstall', 'geminstall'
+    if ARGV[1].nil? || ARGV[1] == '--help' || ARGV[1] == '-h'
+      puts "Usage: cli pkginstall PACKAGE_NAME [SCOPE]"
+      puts "       cli geminstall GEM_NAME [SCOPE]"
+      puts ""
+      puts "Install a package/gem into a loaded plugin"
+      puts ""
+      puts "Arguments:"
+      puts "  PACKAGE_NAME      Name of the package to install (required)"
+      puts "  SCOPE             Scope for installation (optional, default: DEFAULT)"
+      puts ""
+      puts "Options:"
+      puts "  -h, --help        Show this help message"
+      exit(ARGV[1].nil? ? 1 : 0)
+    end
     cli_pkg_install(ARGV[1], scope: ARGV[2])
 
   when 'pkguninstall', 'gemuninstall'
+    if ARGV[1].nil? || ARGV[1] == '--help' || ARGV[1] == '-h'
+      puts "Usage: cli pkguninstall PACKAGE_NAME [SCOPE]"
+      puts "       cli gemuninstall GEM_NAME [SCOPE]"
+      puts ""
+      puts "Uninstall a package/gem from a loaded plugin"
+      puts ""
+      puts "Arguments:"
+      puts "  PACKAGE_NAME      Name of the package to uninstall (required)"
+      puts "  SCOPE             Scope for uninstallation (optional, default: DEFAULT)"
+      puts ""
+      puts "Options:"
+      puts "  -h, --help        Show this help message"
+      exit(ARGV[1].nil? ? 1 : 0)
+    end
     cli_pkg_uninstall(ARGV[1], scope: ARGV[2])
 
   when 'generate'
@@ -934,6 +1087,19 @@ if not ARGV[0].nil? # argument(s) given
     xtce_converter(ARGV[1..-1])
 
   when 'bridge'
+    if ARGV[1] == '--help' || ARGV[1] == '-h'
+      puts "Usage: cli bridge [FILENAME] [PARAMS...]"
+      puts ""
+      puts "Run a COSMOS bridge from a bridge configuration file"
+      puts ""
+      puts "Arguments:"
+      puts "  FILENAME          Bridge config file (optional, default: bridge.txt)"
+      puts "  PARAMS            Additional parameters to pass to bridge"
+      puts ""
+      puts "Options:"
+      puts "  -h, --help        Show this help message"
+      exit 0
+    end
     ENV['OPENC3_NO_STORE'] = '1'
     filename = ARGV[1]
     filename = 'bridge.txt' unless filename
@@ -942,6 +1108,19 @@ if not ARGV[0].nil? # argument(s) given
     run_bridge(filename, params)
 
   when 'bridgegem'
+    if ARGV[1].nil? || ARGV[1] == '--help' || ARGV[1] == '-h'
+      puts "Usage: cli bridgegem GEM_NAME [PARAMS...]"
+      puts ""
+      puts "Run a COSMOS bridge from a gem's bridge.txt file"
+      puts ""
+      puts "Arguments:"
+      puts "  GEM_NAME          Name of the gem containing bridge.txt (required)"
+      puts "  PARAMS            Additional parameters to pass to bridge"
+      puts ""
+      puts "Options:"
+      puts "  -h, --help        Show this help message"
+      exit(ARGV[1].nil? ? 1 : 0)
+    end
     ENV['OPENC3_NO_STORE'] = '1'
     filename = nil
     gem_name = ARGV[1]
@@ -967,6 +1146,18 @@ if not ARGV[0].nil? # argument(s) given
     run_bridge(filename, params)
 
   when 'bridgesetup'
+    if ARGV[1] == '--help' || ARGV[1] == '-h'
+      puts "Usage: cli bridgesetup [FILENAME]"
+      puts ""
+      puts "Generate a default bridge configuration file"
+      puts ""
+      puts "Arguments:"
+      puts "  FILENAME          Output filename (optional, default: bridge.txt)"
+      puts ""
+      puts "Options:"
+      puts "  -h, --help        Show this help message"
+      exit 0
+    end
     ENV['OPENC3_NO_STORE'] = '1'
     filename = ARGV[1]
     filename = 'bridge.txt' unless filename
@@ -978,10 +1169,36 @@ if not ARGV[0].nil? # argument(s) given
     print_usage()
 
   when 'redis'
+    if ARGV[1] == '--help' || ARGV[1] == '-h'
+      puts "Usage: cli redis COMMAND [ARGS...]"
+      puts ""
+      puts "Interact with the Redis database"
+      puts ""
+      puts "Commands:"
+      puts "  keys              Get all Redis keys"
+      puts "  hget HASH KEY     Get a value from a Redis hash"
+      puts ""
+      puts "Options:"
+      puts "  -h, --help        Show this help message"
+      exit 0
+    end
     case (ARGV[1])
     when 'keys'
       get_redis_keys()
     when 'hget'
+      if ARGV[2].nil? || ARGV[3].nil? || ARGV[2] == '--help' || ARGV[2] == '-h'
+        puts "Usage: cli redis hget HASH KEY"
+        puts ""
+        puts "Get a value from a Redis hash"
+        puts ""
+        puts "Arguments:"
+        puts "  HASH              Redis hash name (required)"
+        puts "  KEY               Key within the hash (required)"
+        puts ""
+        puts "Options:"
+        puts "  -h, --help        Show this help message"
+        exit(ARGV[2].nil? || ARGV[3].nil? ? 1 : 0)
+      end
       redis = Redis.new(url: $redis_url, username: ENV['OPENC3_REDIS_USERNAME'], password: ENV['OPENC3_REDIS_PASSWORD'])
       puts JSON.parse(redis.hget(ARGV[2], ARGV[3]), allow_nan: true, create_additions: true)
     else
@@ -990,6 +1207,16 @@ if not ARGV[0].nil? # argument(s) given
     end
 
   when 'removebase'
+    if ARGV[1] == '--help' || ARGV[1] == '-h'
+      puts "Usage: cli removebase"
+      puts ""
+      puts "Remove non-enterprise tool base and admin plugins from all scopes"
+      puts "This is typically used to support enterprise upgrades"
+      puts ""
+      puts "Options:"
+      puts "  -h, --help        Show this help message"
+      exit 0
+    end
     # Used to remove tool base to better support enterprise upgrade
     scopes = OpenC3::ScopeModel.all
     scopes.each do |scope_name, _scope|
@@ -1005,6 +1232,16 @@ if not ARGV[0].nil? # argument(s) given
     end
 
   when 'removeenterprise'
+    if ARGV[1] == '--help' || ARGV[1] == '-h'
+      puts "Usage: cli removeenterprise"
+      puts ""
+      puts "Remove all enterprise plugins from all scopes"
+      puts "This is typically used to support downgrades"
+      puts ""
+      puts "Options:"
+      puts "  -h, --help        Show this help message"
+      exit 0
+    end
     # Used to remove enterprise plugins to better support downgrade
     scopes = OpenC3::ScopeModel.all
     scopes.each do |scope_name, _scope|
@@ -1017,6 +1254,19 @@ if not ARGV[0].nil? # argument(s) given
     end
 
   when 'createqueue'
+    if ARGV[1].nil? || ARGV[1] == '--help' || ARGV[1] == '-h'
+      puts "Usage: cli createqueue QUEUE_NAME [SCOPE]"
+      puts ""
+      puts "Create a new queue in the specified scope"
+      puts ""
+      puts "Arguments:"
+      puts "  QUEUE_NAME        Name of the queue to create (required)"
+      puts "  SCOPE             Scope for the queue (optional, default: DEFAULT)"
+      puts ""
+      puts "Options:"
+      puts "  -h, --help        Show this help message"
+      exit(ARGV[1].nil? ? 1 : 0)
+    end
     queue = OpenC3::QueueModel.get(name: ARGV[1], scope: ARGV[2])
     unless queue
       queue = OpenC3::QueueModel.new(name: ARGV[1], state: 'RELEASE', scope: ARGV[2])
@@ -1024,13 +1274,43 @@ if not ARGV[0].nil? # argument(s) given
     end
 
   when 'destroyscope'
+    if ARGV[1].nil? || ARGV[1] == '--help' || ARGV[1] == '-h'
+      puts "Usage: cli destroyscope SCOPE_NAME"
+      puts ""
+      puts "Destroy a scope and all its associated data"
+      puts ""
+      puts "Arguments:"
+      puts "  SCOPE_NAME        Name of the scope to destroy (required)"
+      puts ""
+      puts "Options:"
+      puts "  -h, --help        Show this help message"
+      exit(ARGV[1].nil? ? 1 : 0)
+    end
     scope = OpenC3::ScopeModel.get_model(name: ARGV[1])
     scope.destroy
 
   when 'localinit'
+    if ARGV[1] == '--help' || ARGV[1] == '-h'
+      puts "Usage: cli localinit"
+      puts ""
+      puts "Initialize local mode configuration"
+      puts ""
+      puts "Options:"
+      puts "  -h, --help        Show this help message"
+      exit 0
+    end
     OpenC3::LocalMode.local_init()
 
   when 'initbuckets'
+    if ARGV[1] == '--help' || ARGV[1] == '-h'
+      puts "Usage: cli initbuckets"
+      puts ""
+      puts "Initialize all configured COSMOS buckets"
+      puts ""
+      puts "Options:"
+      puts "  -h, --help        Show this help message"
+      exit 0
+    end
     client = OpenC3::Bucket.getClient()
     ENV.map do |key, value|
       if key.match(/^OPENC3_(.+)_BUCKET$/) && !value.empty?
@@ -1040,6 +1320,15 @@ if not ARGV[0].nil? # argument(s) given
     client.ensure_public(ENV['OPENC3_TOOLS_BUCKET'])
 
   when 'runmigrations'
+    if ARGV[1] == '--help' || ARGV[1] == '-h'
+      puts "Usage: cli runmigrations"
+      puts ""
+      puts "Run database migrations"
+      puts ""
+      puts "Options:"
+      puts "  -h, --help        Show this help message"
+      exit 0
+    end
     run_migrations(ARGV[1])
 
   else # Unknown task

data/lib/openc3/interfaces.rb

@@ -34,14 +34,16 @@ module OpenC3
   autoload(:TcpipServerInterface, 'openc3/interfaces/tcpip_server_interface.rb')
   autoload(:UdpInterface, 'openc3/interfaces/udp_interface.rb')
 
-  autoload(:Protocol, 'openc3/interfaces/protocols/protocol.rb')
   autoload(:BurstProtocol, 'openc3/interfaces/protocols/burst_protocol.rb')
+  autoload(:CmdResponseProtocol, 'openc3/interfaces/protocols/cmd_response_protocol.rb')
+  autoload(:CobsProtocol, 'openc3/interfaces/protocols/cobs_protocol.rb')
+  autoload(:CrcProtocol, 'openc3/interfaces/protocols/crc_protocol.rb')
   autoload(:FixedProtocol, 'openc3/interfaces/protocols/fixed_protocol.rb')
+  autoload(:IgnorePacketProtocol, 'openc3/interfaces/protocols/ignore_packet_protocol.rb')
   autoload(:LengthProtocol, 'openc3/interfaces/protocols/length_protocol.rb')
   autoload(:PreidentifiedProtocol, 'openc3/interfaces/protocols/preidentified_protocol.rb')
+  autoload(:Protocol, 'openc3/interfaces/protocols/protocol.rb')
+  autoload(:SlipProtocol, 'openc3/interfaces/protocols/slip_protocol.rb')
   autoload(:TemplateProtocol, 'openc3/interfaces/protocols/template_protocol.rb')
   autoload(:TerminatedProtocol, 'openc3/interfaces/protocols/terminated_protocol.rb')
-  autoload(:CmdResponseProtocol, 'openc3/interfaces/protocols/cmd_response_protocol.rb')
-  autoload(:CrcProtocol, 'openc3/interfaces/protocols/crc_protocol.rb')
-  autoload(:IgnorePacketProtocol, 'openc3/interfaces/protocols/ignore_packet_protocol.rb')
 end

data/lib/openc3/microservices/interface_microservice.rb

@@ -231,6 +231,8 @@ module OpenC3
           cmd_name = msg_hash['cmd_name']
           manual = ConfigParser.handle_true_false(msg_hash['manual'])
           cmd_params = nil
+          range_check = true
+          raw = false
           cmd_buffer = nil
           hazardous_check = nil
           if msg_hash['cmd_params']
@@ -288,14 +290,13 @@ module OpenC3
             if @critical_commanding and @critical_commanding != 'OFF' and not release_critical
               restricted = command.restricted
               if hazardous or restricted or (@critical_commanding == 'ALL' and manual)
+                cmd_type = 'NORMAL'
                 if hazardous
-                  type = 'HAZARDOUS'
+                  cmd_type = 'HAZARDOUS'
                 elsif restricted
-                  type = 'RESTRICTED'
-                else
-                  type = 'NORMAL'
+                  cmd_type = 'RESTRICTED'
                 end
-                model = CriticalCmdModel.new(name: SecureRandom.uuid, type: type, interface_name: @interface.name, username: msg_hash['username'], cmd_hash: msg_hash, scope: @scope)
+                model = CriticalCmdModel.new(name: SecureRandom.uuid, type: cmd_type, interface_name: @interface.name, username: msg_hash['username'], cmd_hash: msg_hash, scope: @scope)
                 model.create
                 @logger.info("Critical Cmd Pending: #{msg_hash['cmd_string']}", user: msg_hash['username'], scope: @scope)
                 next "CriticalCmdError\n#{model.name}"
@@ -428,10 +429,12 @@ module OpenC3
               params = JSON.parse(msg_hash['params'], allow_nan: true, create_additions: true)
             end
             @router = @tlm.attempting(*params)
+            next 'SUCCESS'
           end
           if msg_hash['disconnect']
             @logger.info "#{@router.name}: Disconnect requested"
             @tlm.disconnect(false)
+            next 'SUCCESS'
           end
           if msg_hash.key?('log_stream')
             if msg_hash['log_stream'] == 'true'
@@ -441,6 +444,7 @@ module OpenC3
               @logger.info "#{@router.name}: Disable stream logging"
               @router.stop_raw_logging
             end
+            next 'SUCCESS'
           end
           if msg_hash.key?('router_cmd')
             params = JSON.parse(msg_hash['router_cmd'], allow_nan: true, create_additions: true)

data/lib/openc3/microservices/queue_microservice.rb

@@ -18,8 +18,9 @@
 
 require 'openc3/microservices/microservice'
 require 'openc3/topics/queue_topic'
+require 'openc3/models/queue_model'
 require 'openc3/utilities/authentication'
-require 'openc3/script'
+require 'openc3/api/api'
 
 module OpenC3
   module Script
@@ -32,6 +33,8 @@ module OpenC3
 
   # The queue processor runs in a single thread and processes commands via cmd_api.
   class QueueProcessor
+    include Api # Provides access to api methods
+
     attr_accessor :state
     attr_reader :name, :scope
 
@@ -43,23 +46,6 @@ module OpenC3
       @cancel_thread = false
     end
 
-    def get_token(username)
-      if ENV['OPENC3_API_CLIENT'].nil?
-        ENV['OPENC3_API_PASSWORD'] ||= ENV['OPENC3_SERVICE_PASSWORD']
-        return OpenC3Authentication.new().token
-      else
-        # Check for offline access token
-        model = nil
-        model = OpenC3::OfflineAccessModel.get_model(name: username, scope: @scope) if username and username != ''
-        if model and model.offline_access_token
-          auth = OpenC3KeycloakAuthentication.new(ENV['OPENC3_KEYCLOAK_URL'])
-          return auth.get_token_from_refresh_token(model.offline_access_token)
-        else
-          return nil
-        end
-      end
-    end
-
     def run
       while true
         if @state == 'RELEASE'
@@ -77,13 +63,11 @@ module OpenC3
           _queue_name, command_data, _timestamp = Store.bzpopmin("#{@scope}:#{@name}", timeout: 0.2)
           if command_data
             command = JSON.parse(command_data)
-            username = command['username']
-            token = get_token(username)
             # It's important to set queue: false here to avoid infinite recursion when
             # OPENC3_DEFAULT_QUEUE is set because commands would be re-queued to the default queue
             # NOTE: cmd() via script rescues hazardous errors and calls prompt_for_hazardous()
             # but we've overridden it to always return true and go straight to cmd_no_hazardous_check()
-            cmd(command['value'], queue: false, scope: @scope, token: token)
+            cmd(command['value'], queue: false, scope: @scope)
           end
         rescue StandardError => e
           @logger.error "QueueProcessor failed to process command from queue #{@name}\n#{e.message}"
@@ -107,15 +91,22 @@ module OpenC3
       @queue_name = @name.split('__')[2]
 
       initial_state = 'HOLD'
-      (@config['options'] || []).each do |option|
-        case option[0].upcase
-        when 'QUEUE_STATE'
-          initial_state = option[1]
-        else
-          @logger.error("Unknown option passed to microservice #{@name}: #{option}")
+      # See if the queue already exists to get its state
+      queue = OpenC3::QueueModel.get(name: @queue_name, scope: @scope)
+      if queue
+        initial_state = queue['state']
+      else
+        (@config['options'] || []).each do |option|
+          case option[0].upcase
+          when 'QUEUE_STATE'
+            initial_state = option[1]
+          else
+            @logger.error("Unknown option passed to microservice #{@name}: #{option}")
+          end
         end
       end
 
+      @logger.info "Creating QueueMicroservice in scope #{@scope} for queue #{@queue_name} with initial state #{initial_state}"
       @processor = QueueProcessor.new(name: @queue_name, state: initial_state, logger: @logger, scope: @scope)
       @processor_thread = nil
       @read_topic = true

data/lib/openc3/models/microservice_model.rb

@@ -157,7 +157,7 @@ module OpenC3
         'updated_at' => @updated_at,
         'plugin' => @plugin,
         'needs_dependencies' => @needs_dependencies,
-        'secrets' => @secrets.as_json(*a),
+        'secrets' => @secrets,
         'prefix' => @prefix,
         'disable_erb' => @disable_erb,
         'ignore_changes' => @ignore_changes,