openc3 6.8.1 → 6.9.1

data/lib/openc3/models/queue_model.rb

@@ -51,11 +51,11 @@ module OpenC3
       if model.state != 'DISABLE'
         result = Store.zrevrange("#{scope}:#{name}", 0, 0, with_scores: true)
         if result.empty?
-          index = 1.0
+          id = 1.0
         else
-          index = result[0][1].to_f + 1
+          id = result[0][1].to_f + 1
         end
-        Store.zadd("#{scope}:#{name}", index, { username: username, value: command, timestamp: Time.now.to_nsec_from_epoch }.to_json)
+        Store.zadd("#{scope}:#{name}", id, { username: username, value: command, timestamp: Time.now.to_nsec_from_epoch }.to_json)
         model.notify(kind: 'command')
       else
         raise QueueError, "Queue '#{name}' is disabled. Command '#{command}' not queued."
@@ -98,60 +98,60 @@ module OpenC3
     def notify(kind:)
       notification = {
         'kind' => kind,
-        'data' => JSON.generate(as_json(:allow_nan => true)),
+        'data' => JSON.generate(as_json, allow_nan: true),
       }
       QueueTopic.write_notification(notification, scope: @scope)
     end
 
-    def insert_command(index, command_data)
+    def insert_command(id, command_data)
       if @state == 'DISABLE'
         raise QueueError, "Queue '#{@name}' is disabled. Command '#{command_data['value']}' not queued."
       end
 
-      unless index
+      unless id
         result = Store.zrevrange("#{@scope}:#{@name}", 0, 0, with_scores: true)
         if result.empty?
-          index = 1.0
+          id = 1.0
         else
-          index = result[0][1].to_f + 1
+          id = result[0][1].to_f + 1
         end
       end
-      Store.zadd("#{@scope}:#{@name}", index, command_data.to_json)
+      Store.zadd("#{@scope}:#{@name}", id, command_data.to_json)
       notify(kind: 'command')
     end
 
-    def update_command(index:, command:, username:)
+    def update_command(id:, command:, username:)
       if @state == 'DISABLE'
-        raise QueueError, "Queue '#{@name}' is disabled. Command at index #{index} not updated."
+        raise QueueError, "Queue '#{@name}' is disabled. Command at id #{id} not updated."
       end
 
-      # Check if command exists at the given index
-      existing = Store.zrangebyscore("#{@scope}:#{@name}", index, index)
+      # Check if command exists at the given id
+      existing = Store.zrangebyscore("#{@scope}:#{@name}", id, id)
       if existing.empty?
-        raise QueueError, "No command found at index #{index} in queue '#{@name}'"
+        raise QueueError, "No command found at id #{id} in queue '#{@name}'"
       end
 
-      # Remove the existing command and add the new one at the same index
-      Store.zremrangebyscore("#{@scope}:#{@name}", index, index)
+      # Remove the existing command and add the new one at the same id
+      Store.zremrangebyscore("#{@scope}:#{@name}", id, id)
       command_data = { username: username, value: command, timestamp: Time.now.to_nsec_from_epoch }
-      Store.zadd("#{@scope}:#{@name}", index, command_data.to_json)
+      Store.zadd("#{@scope}:#{@name}", id, command_data.to_json)
       notify(kind: 'command')
     end
 
-    def remove_command(index = nil)
+    def remove_command(id = nil)
       if @state == 'DISABLE'
         raise QueueError, "Queue '#{@name}' is disabled. Command not removed."
       end
 
-      if index
-        # Remove specific index
-        result = Store.zrangebyscore("#{@scope}:#{@name}", index, index)
+      if id
+        # Remove specific id
+        result = Store.zrangebyscore("#{@scope}:#{@name}", id, id)
         if result.empty?
           return nil
         else
-          Store.zremrangebyscore("#{@scope}:#{@name}", index, index)
+          Store.zremrangebyscore("#{@scope}:#{@name}", id, id)
           command_data = JSON.parse(result[0])
-          command_data['index'] = index.to_f
+          command_data['id'] = id.to_f
           notify(kind: 'command')
           return command_data
         end
@@ -164,7 +164,7 @@ module OpenC3
           score = result[0][1]
           Store.zremrangebyscore("#{@scope}:#{@name}", score, score)
           command_data = JSON.parse(result[0][0])
-          command_data['index'] = score.to_f
+          command_data['id'] = score.to_f
           notify(kind: 'command')
           return command_data
         end
@@ -174,7 +174,7 @@ module OpenC3
     def list
       return Store.zrange("#{@scope}:#{@name}", 0, -1, with_scores: true).map do |item|
         result = JSON.parse(item[0])
-        result['index'] = item[1].to_f
+        result['id'] = item[1].to_f
         result
       end
     end

data/lib/openc3/models/reaction_model.rb

@@ -206,14 +206,14 @@ module OpenC3
       end
       verify_triggers()
       @updated_at = Time.now.to_nsec_from_epoch
-      Store.hset(@primary_key, @name, JSON.generate(as_json(:allow_nan => true)))
+      Store.hset(@primary_key, @name, JSON.generate(as_json, allow_nan: true))
       notify(kind: 'created')
     end
 
     def update
       verify_triggers()
       @updated_at = Time.now.to_nsec_from_epoch
-      Store.hset(@primary_key, @name, JSON.generate(as_json(:allow_nan => true)))
+      Store.hset(@primary_key, @name, JSON.generate(as_json, allow_nan: true))
       # No notification as this is only called via reaction_controller which already notifies
     end
 
@@ -241,7 +241,7 @@ module OpenC3
       if @snooze > 0
         @snoozed_until = Time.now.to_i + @snooze
         @updated_at = Time.now.to_nsec_from_epoch
-        Store.hset(@primary_key, @name, JSON.generate(as_json(:allow_nan => true)))
+        Store.hset(@primary_key, @name, JSON.generate(as_json, allow_nan: true))
         notify(kind: 'snoozed')
       end
     end
@@ -249,7 +249,7 @@ module OpenC3
     def awaken
       @snoozed_until = nil
       @updated_at = Time.now.to_nsec_from_epoch
-      Store.hset(@primary_key, @name, JSON.generate(as_json(:allow_nan => true)))
+      Store.hset(@primary_key, @name, JSON.generate(as_json, allow_nan: true))
       notify(kind: 'awakened')
     end
 
@@ -272,7 +272,7 @@ module OpenC3
 
     # @return [ReactionModel] Model generated from the passed JSON
     def self.from_json(json, name:, scope:)
-      json = JSON.parse(json, :allow_nan => true, :create_additions => true) if String === json
+      json = JSON.parse(json, allow_nan: true, create_additions: true) if String === json
       raise "json data is nil" if json.nil?
       self.new(**json.transform_keys(&:to_sym), name: name, scope: scope)
     end
@@ -282,7 +282,7 @@ module OpenC3
       notification = {
         'kind' => kind,
         'type' => 'reaction',
-        'data' => JSON.generate(as_json(:allow_nan => true)),
+        'data' => JSON.generate(as_json, allow_nan: true),
       }
       AutonomicTopic.write_notification(notification, scope: @scope)
     end

data/lib/openc3/models/script_engine_model.rb

@@ -45,7 +45,7 @@ module OpenC3
     def self.all(scope: nil)
       tools = Store.hgetall(PRIMARY_KEY)
       tools.each do |key, value|
-        tools[key] = JSON.parse(value, :allow_nan => true, :create_additions => true)
+        tools[key] = JSON.parse(value, allow_nan: true, create_additions: true)
       end
       return tools
     end

data/lib/openc3/models/script_status_model.rb

@@ -88,7 +88,7 @@ module OpenC3
           if r.nil?
             nil
           else
-            JSON.parse(r, :allow_nan => true, :create_additions => true)
+            JSON.parse(r, allow_nan: true, create_additions: true)
           end
         end
         return result
@@ -113,7 +113,7 @@ module OpenC3
           if r.nil?
             nil
           else
-            JSON.parse(r, :allow_nan => true, :create_additions => true)
+            JSON.parse(r, allow_nan: true, create_additions: true)
           end
         end
         return result
@@ -204,7 +204,7 @@ module OpenC3
       else
         write_store = self.class.store
       end
-      write_store.hset(@primary_key, @name, JSON.generate(self.as_json(:allow_nan => true), :allow_nan => true))
+      write_store.hset(@primary_key, @name, JSON.generate(self.as_json(), allow_nan: true))
 
       # Also add to ordered set on create
       write_store.zadd(@primary_key + "__LIST", @name.to_i, @name) if not update

data/lib/openc3/models/sorted_model.rb

@@ -50,14 +50,14 @@ module OpenC3
     # @return [String|nil] String of the saved json or nil if start not found
     def self.get(start:, scope:)
       result = Store.zrangebyscore(self.pk(scope), start, start)
-      return JSON.parse(result[0], :allow_nan => true, :create_additions => true) unless result.empty?
+      return JSON.parse(result[0], allow_nan: true, create_additions: true) unless result.empty?
       nil
     end
 
     # @return [Array<Hash>] Array up to the limit of the models (as Hash objects) stored under the primary key
     def self.all(scope:, limit: 100)
       result = Store.zrevrangebyscore(self.pk(scope), '+inf', '-inf', limit: [0, limit])
-      return result.map { |item| JSON.parse(item, :allow_nan => true, :create_additions => true) }
+      return result.map { |item| JSON.parse(item, allow_nan: true, create_additions: true) }
     end
 
     # @return [String|nil] json or nil if metadata empty
@@ -76,7 +76,7 @@ module OpenC3
         raise SortedInputError.new "start: #{start} must be before stop: #{stop}"
       end
       result = Store.zrangebyscore(self.pk(scope), start, stop, limit: [0, limit])
-      return result.map { |item| JSON.parse(item, :allow_nan => true, :create_additions => true) }
+      return result.map { |item| JSON.parse(item, allow_nan: true, create_additions: true) }
     end
 
     # @return [Integer] count of the members stored under the primary key
@@ -132,7 +132,7 @@ module OpenC3
       validate_start(update: update)
       @updated_at = Time.now.to_nsec_from_epoch
       SortedModel.destroy(scope: @scope, start: update) if update
-      Store.zadd(@primary_key, @start, JSON.generate(as_json(:allow_nan => true)))
+      Store.zadd(@primary_key, @start, JSON.generate(as_json, allow_nan: true))
       if update
         notify(kind: 'updated')
       else
@@ -156,7 +156,7 @@ module OpenC3
     # @return [] update the redis stream / timeline topic that something has changed
     def notify(kind:, extra: nil)
       notification = {
-        'data' => JSON.generate(as_json(:allow_nan => true)),
+        'data' => JSON.generate(as_json, allow_nan: true),
         'kind' => kind,
         'type' => 'calendar',
       }

data/lib/openc3/models/target_model.rb

@@ -207,7 +207,7 @@ module OpenC3
       json = Store.hget("#{scope}__openc3#{type.to_s.downcase}__#{target_name}", packet_name)
       raise "Packet '#{target_name} #{packet_name}' does not exist" if json.nil?
 
-      JSON.parse(json, :allow_nan => true, :create_additions => true)
+      JSON.parse(json, allow_nan: true, create_additions: true)
     end
 
     # @return [Array<Hash>] All packet hashes under the target_name
@@ -218,7 +218,7 @@ module OpenC3
       result = []
       packets = Store.hgetall("#{scope}__openc3#{type.to_s.downcase}__#{target_name}")
       packets.sort.each do |_packet_name, packet_json|
-        result << JSON.parse(packet_json, :allow_nan => true, :create_additions => true)
+        result << JSON.parse(packet_json, allow_nan: true, create_additions: true)
       end
       result
     end
@@ -232,7 +232,7 @@ module OpenC3
       raise "Unknown type #{type} for #{target_name} #{packet_name}" unless VALID_TYPES.include?(type)
 
       begin
-        Store.hset("#{scope}__openc3#{type.to_s.downcase}__#{target_name}", packet_name, JSON.generate(packet.as_json(:allow_nan => true)))
+        Store.hset("#{scope}__openc3#{type.to_s.downcase}__#{target_name}", packet_name, JSON.generate(packet.as_json, allow_nan: true))
       rescue JSON::GeneratorError => e
         Logger.error("Invalid text present in #{target_name} #{packet_name} #{type.to_s.downcase} packet")
         raise e
@@ -289,7 +289,7 @@ module OpenC3
     def self.limits_groups(scope:)
       groups = Store.hgetall("#{scope}__limits_groups")
       if groups
-        groups.map { |group, items| [group, JSON.parse(items, :allow_nan => true, :create_additions => true)] }.to_h
+        groups.map { |group, items| [group, JSON.parse(items, allow_nan: true, create_additions: true)] }.to_h
       else
         {}
       end
@@ -302,10 +302,10 @@ module OpenC3
       target_name = target_name.upcase
       json_data = Store.get(item_map_key)
       if json_data
-        item_map = JSON.parse(json_data, :allow_nan => true, :create_additions => true)
+        item_map = JSON.parse(json_data, allow_nan: true, create_additions: true)
       else
         item_map = build_item_to_packet_map(target_name, scope: scope)
-        Store.set(item_map_key, JSON.generate(item_map, :allow_nan => true))
+        Store.set(item_map_key, JSON.generate(item_map, allow_nan: true))
       end
       @@item_map_cache[target_name] = [Time.now, item_map]
       return item_map
@@ -462,7 +462,7 @@ module OpenC3
         'reduced_day_log_retain_time' => @reduced_day_log_retain_time,
         'cleanup_poll_time' => @cleanup_poll_time,
         'needs_dependencies' => @needs_dependencies,
-        'target_microservices' => @target_microservices.as_json(:allow_nan => true),
+        'target_microservices' => @target_microservices.as_json(),
         'reducer_disable' => @reducer_disable,
         'reducer_max_cpu_utilization' => @reducer_max_cpu_utilization,
         'disable_erb' => @disable_erb,
@@ -802,7 +802,7 @@ module OpenC3
         packets.each do |packet_name, packet|
           Logger.debug "Configuring tlm packet: #{target_name} #{packet_name}"
           begin
-            Store.hset("#{@scope}__openc3tlm__#{target_name}", packet_name, JSON.generate(packet.as_json(:allow_nan => true)))
+            Store.hset("#{@scope}__openc3tlm__#{target_name}", packet_name, JSON.generate(packet.as_json, allow_nan: true))
           rescue JSON::GeneratorError => e
             Logger.error("Invalid text present in #{target_name} #{packet_name} tlm packet")
             raise e
@@ -826,7 +826,7 @@ module OpenC3
         packets.each do |packet_name, packet|
           Logger.debug "Configuring cmd packet: #{target_name} #{packet_name}"
           begin
-            Store.hset("#{@scope}__openc3cmd__#{target_name}", packet_name, JSON.generate(packet.as_json(:allow_nan => true)))
+            Store.hset("#{@scope}__openc3cmd__#{target_name}", packet_name, JSON.generate(packet.as_json, allow_nan: true))
           rescue JSON::GeneratorError => e
             Logger.error("Invalid text present in #{target_name} #{packet_name} cmd packet")
             raise e
@@ -838,7 +838,7 @@ module OpenC3
     def update_store_limits_groups(system)
       system.limits.groups.each do |group, items|
         begin
-          Store.hset("#{@scope}__limits_groups", group, JSON.generate(items))
+          Store.hset("#{@scope}__limits_groups", group, JSON.generate(items, allow_nan: true))
         rescue JSON::GeneratorError => e
           Logger.error("Invalid text present in #{group} limits group")
           raise e
@@ -859,7 +859,7 @@ module OpenC3
       # Create item_map
       item_map_key = "#{@scope}__#{@name}__item_to_packet_map"
       item_map = self.class.build_item_to_packet_map(@name, scope: @scope)
-      Store.set(item_map_key, JSON.generate(item_map, :allow_nan => true))
+      Store.set(item_map_key, JSON.generate(item_map, allow_nan: true))
       @@item_map_cache[@name] = [Time.now, item_map]
     end
 

data/lib/openc3/models/timeline_model.rb

@@ -72,7 +72,7 @@ module OpenC3
 
     # @return [TimelineModel] Model generated from the passed JSON
     def self.from_json(json, name:, scope:)
-      json = JSON.parse(json, :allow_nan => true, :create_additions => true) if String === json
+      json = JSON.parse(json, allow_nan: true, create_additions: true) if String === json
       raise "json data is nil" if json.nil?
       self.new(**json.transform_keys(&:to_sym), name: name, scope: scope)
     end
@@ -120,7 +120,7 @@ module OpenC3
     # @return [] update the redis stream / timeline topic that something has changed
     def notify(kind:)
       notification = {
-        'data' => JSON.generate(as_json(:allow_nan => true)),
+        'data' => JSON.generate(as_json, allow_nan: true),
         'kind' => kind,
         'type' => 'timeline',
         'timeline' => @timeline_name

data/lib/openc3/models/tool_model.rb

@@ -298,7 +298,7 @@ module OpenC3
     def self.unordered_all(scope: nil)
       tools = Store.hgetall("#{scope}__#{PRIMARY_KEY}")
       tools.each do |key, value|
-        tools[key] = JSON.parse(value, :allow_nan => true, :create_additions => true)
+        tools[key] = JSON.parse(value, allow_nan: true, create_additions: true)
       end
       return tools
     end

data/lib/openc3/models/trigger_group_model.rb

@@ -101,19 +101,19 @@ module OpenC3
 
     # @return [TriggerGroupModel] Model generated from the passed JSON
     def self.from_json(json, name:, scope:)
-      json = JSON.parse(json, :allow_nan => true, :create_additions => true) if String === json
+      json = JSON.parse(json, allow_nan: true, create_additions: true) if String === json
       raise "json data is nil" if json.nil?
       self.new(**json.transform_keys(&:to_sym), name: name, scope: scope)
     end
 
     # @return [] update the redis stream / trigger topic that something has changed
     def notify(kind:, error: nil)
-      data = as_json(:allow_nan => true)
+      data = as_json()
       data['error'] = error unless error.nil?
       notification = {
         'kind' => kind,
         'type' => 'group',
-        'data' => JSON.generate(data),
+        'data' => JSON.generate(data, allow_nan: true),
       }
       AutonomicTopic.write_notification(notification, scope: @scope)
     end

data/lib/openc3/models/trigger_model.rb

@@ -200,21 +200,21 @@ module OpenC3
       end
       verify_triggers()
       @updated_at = Time.now.to_nsec_from_epoch
-      Store.hset(@primary_key, @name, JSON.generate(as_json(:allow_nan => true)))
+      Store.hset(@primary_key, @name, JSON.generate(as_json, allow_nan: true))
       notify(kind: 'created')
     end
 
     def update
       verify_triggers()
       @updated_at = Time.now.to_nsec_from_epoch
-      Store.hset(@primary_key, @name, JSON.generate(as_json(:allow_nan => true)))
+      Store.hset(@primary_key, @name, JSON.generate(as_json, allow_nan: true))
       # No notification as this is only called via trigger_controller which already notifies
     end
 
     def state=(value)
       @state = value
       @updated_at = Time.now.to_nsec_from_epoch
-      Store.hset(@primary_key, @name, JSON.generate(as_json(:allow_nan => true)))
+      Store.hset(@primary_key, @name, JSON.generate(as_json, allow_nan: true))
       notify(kind: @state.to_s)
     end
 
@@ -232,7 +232,7 @@ module OpenC3
     def disable
       notify_disable()
       @updated_at = Time.now.to_nsec_from_epoch
-      Store.hset(@primary_key, @name, JSON.generate(as_json(:allow_nan => true)))
+      Store.hset(@primary_key, @name, JSON.generate(as_json, allow_nan: true))
     end
 
     # ["#{@scope}__DECOM__{#{@target}}__#{@packet}"]
@@ -278,7 +278,7 @@ module OpenC3
 
     # @return [TriggerModel] Model generated from the passed JSON
     def self.from_json(json, name:, scope:)
-      json = JSON.parse(json, :allow_nan => true, :create_additions => true) if String === json
+      json = JSON.parse(json, allow_nan: true, create_additions: true) if String === json
       raise "json data is nil" if json.nil?
       self.new(**json.transform_keys(&:to_sym), name: name, scope: scope)
     end
@@ -288,7 +288,7 @@ module OpenC3
       notification = {
         'kind' => kind,
         'type' => 'trigger',
-        'data' => JSON.generate(as_json(:allow_nan => true)),
+        'data' => JSON.generate(as_json, allow_nan: true),
       }
       AutonomicTopic.write_notification(notification, scope: @scope)
     end

data/lib/openc3/models/widget_model.rb

@@ -54,7 +54,7 @@ module OpenC3
     def self.all(scope: nil)
       tools = Store.hgetall("#{scope}__#{PRIMARY_KEY}")
       tools.each do |key, value|
-        tools[key] = JSON.parse(value, :allow_nan => true, :create_additions => true)
+        tools[key] = JSON.parse(value, allow_nan: true, create_additions: true)
       end
       return tools
     end

data/lib/openc3/operators/operator.rb

@@ -196,13 +196,13 @@ module OpenC3
         stdout = @process.io.stdout.extract
         if stdout.length > 0
           message = "STDOUT #{stdout.length} bytes from #{cmd_line()}:"
-          STDOUT.puts Logger.build_log_data(Logger::INFO_LEVEL, message, user: nil, type: OpenC3::Logger::LOG, url: nil).as_json(:allow_nan => true).to_json(:allow_nan => true)
+          STDOUT.puts Logger.build_log_data(Logger::INFO_LEVEL, message, user: nil, type: OpenC3::Logger::LOG, url: nil).as_json().to_json(allow_nan: true)
           STDOUT.puts stdout
         end
         stderr = @process.io.stderr.extract
         if stderr.length > 0
           message = "STDERR #{stderr.length} bytes from #{cmd_line()}:"
-          STDERR.puts Logger.build_log_data(Logger::ERROR_LEVEL, message, user: nil, type: OpenC3::Logger::LOG, url: nil).as_json(:allow_nan => true).to_json(:allow_nan => true)
+          STDERR.puts Logger.build_log_data(Logger::ERROR_LEVEL, message, user: nil, type: OpenC3::Logger::LOG, url: nil).as_json().to_json(allow_nan: true)
           STDERR.puts stderr
         end
       end

data/lib/openc3/packets/json_packet.rb

@@ -48,7 +48,7 @@ module OpenC3
       end
       @extra = extra
       @json_hash = json_data
-      @json_hash = JSON.parse(json_data, :allow_nan => true, :create_additions => true) if String === json_data
+      @json_hash = JSON.parse(json_data, allow_nan: true, create_additions: true) if String === json_data
       if key_map
         uncompressed = {}
         @json_hash.each do |key, value|

data/lib/openc3/packets/packet.rb

@@ -1054,7 +1054,7 @@ module OpenC3
         end
       end
       packet.instance_variable_set("@read_conversion_cache".freeze, nil)
-      packet.extra = JSON.parse(packet.extra.as_json(:allow_nan => true).to_json(:allow_nan => true), :allow_nan => true, :create_additions => true) if packet.extra # Deep copy using JSON
+      packet.extra = JSON.parse(packet.extra.as_json().to_json(allow_nan: true), allow_nan: true, create_additions: true) if packet.extra # Deep copy using JSON
       packet
     end
     alias dup clone

data/lib/openc3/script/calendar.rb

@@ -98,10 +98,10 @@ module OpenC3
     def _cal_handle_response(response, error_message)
       return nil if response.nil?
       if response.status >= 400
-        result = JSON.parse(response.body, :allow_nan => true, :create_additions => true)
+        result = JSON.parse(response.body, allow_nan: true, create_additions: true)
         raise "#{error_message} due to #{result['message']}"
       end
-      return JSON.parse(response.body, :allow_nan => true, :create_additions => true)
+      return JSON.parse(response.body, allow_nan: true, create_additions: true)
     end
   end
 end

data/lib/openc3/script/metadata.rb

@@ -36,7 +36,7 @@ module OpenC3
       response = $api_server.request('get', "/openc3-api/metadata", query: { limit: limit }, scope: scope)
       # Non-existent just returns nil
       return nil if response.nil? || response.status != 200
-      return JSON.parse(response.body, :allow_nan => true, :create_additions => true)
+      return JSON.parse(response.body, allow_nan: true, create_additions: true)
     end
     alias all_metadata metadata_all
 
@@ -51,7 +51,7 @@ module OpenC3
       end
       # Non-existent just returns nil
       return nil if response.nil? || response.status != 200
-      return JSON.parse(response.body, :allow_nan => true, :create_additions => true)
+      return JSON.parse(response.body, allow_nan: true, create_additions: true)
     end
     alias get_metadata metadata_get
 
@@ -76,7 +76,7 @@ module OpenC3
       elsif response.status != 201
         raise "Failed to set metadata due to #{response.status}"
       end
-      return JSON.parse(response.body, :allow_nan => true, :create_additions => true)
+      return JSON.parse(response.body, allow_nan: true, create_additions: true)
     end
     alias set_metadata metadata_set
 
@@ -104,7 +104,7 @@ module OpenC3
       if response.nil? || response.status != 200
         raise "Failed to update metadata"
       end
-      return JSON.parse(response.body, :allow_nan => true, :create_additions => true)
+      return JSON.parse(response.body, allow_nan: true, create_additions: true)
     end
     alias update_metadata metadata_update
 

data/lib/openc3/script/queue.rb

@@ -30,10 +30,10 @@ module OpenC3
       if response.nil?
         raise "Failed to #{action}. No response from server."
       elsif response.status != 200 and response.status != 201
-        result = JSON.parse(response.body, :allow_nan => true, :create_additions => true)
-        raise "Failed to #{action} due to #{result['message']}"
+        result = JSON.parse(response.body, allow_nan: true, create_additions: true)
+        raise "#{action} failed with status #{response.status}. #{result['message']}."
       end
-      return JSON.parse(response.body, :allow_nan => true, :create_additions => true)
+      return JSON.parse(response.body, allow_nan: true, create_additions: true)
     end
 
     def queue_all(scope: $openc3_scope)
@@ -66,12 +66,20 @@ module OpenC3
       return _make_request(action: 'disable queue', verb: 'post', uri: "/openc3-api/queues/#{name}/disable", scope: scope)
     end
 
-    def queue_exec(name, index: nil, scope: $openc3_scope)
+    def queue_exec(name, id=nil, scope: $openc3_scope)
       data = {}
-      data['index'] = index if index
+      data['id'] = id if id
       return _make_request(action: 'exec command', verb: 'post', uri: "/openc3-api/queues/#{name}/exec_command", data: data, scope: scope)
     end
 
+    # No queue_insert because we do that through the cmd APIs with the queue kwarg
+
+    def queue_remove(name, id=nil, scope: $openc3_scope)
+      data = {}
+      data['id'] = id if id
+      return _make_request(action: 'remove command', verb: 'post', uri: "/openc3-api/queues/#{name}/remove_command", data: data, scope: scope)
+    end
+
     def queue_delete(name, scope: $openc3_scope)
       return _make_request(action: 'delete queue', verb: 'delete', uri: "/openc3-api/queues/#{name}", scope: scope)
     end