cosmos 5.0.2 → 5.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f94954d88cfda8c83f25e5f9a073360d2cf2f7ca9ec359212d3aa6c1bce5a909
-  data.tar.gz: ab1f28afba922389b69d3c5527944d9e53d8ceca45ebe25746ef1517a44b54b8
+  metadata.gz: 8cc294c0ebdd3984fd89fc3a21d4c269c47c6bc4bd7851f0f3ef5ae5393ad365
+  data.tar.gz: 89168bfb640bb201cc62f1060b83285326ca7497feeea878c4ec81b6a0c8b40c
 SHA512:
-  metadata.gz: 3b5ed0b4186b705cd0360caabbed8f04daac8eaedf9872b8e22fb147c43a0a748fe98afc1b88a8fc99d15d6bd4b3bb9208c1497bb7732f4ef031b856735c6ea7
-  data.tar.gz: 9353b73975d3d6c0f84560b388e2d175a70c2cd4d6c03dbe2f92a650368007c6c0b44cb8b114292180284bb1b8cd465e8e680fd4d6da85c125fc6fe853bf7156
+  metadata.gz: 4f3524b98078bf0568a703d2622f81865fe1133a34434c203b03d2a29ff7dd55510a762fe06b75584fc35f90ebe06a31b4ee3882cdf2553628368f908912173f
+  data.tar.gz: 6caeb0cefd049620051a44ffbe0d398e6e43a466bbd7c6cc5edb499652cb5c242c769afb91e560b310700059764ec4ecf64a1bc109ed7654af4ecc568c379e88

data/data/config/microservice.yaml

@@ -2,65 +2,77 @@
 MICROSERVICE:
   summary: Defines a new microservice
   example: MICROSERVICE EXAMPLE example-microservice
+  description: Defines a microservice that the plugin adds to the COSMOS system. Microservices are background software processes that perform persistent processing.
   parameters:
-    - name: Folder Name
+    - name: Microservice Folder Name
+      description: The exact name of the microservice folder in the plugin. ie. microservices/<Microservice Folder Name>
       required: true
-      description: The target folder where the microservice is located
-      values: .*
-    - name: Name
+      values: .+
+    - name: Microservice Name
+      description: The specific name of this instance of the microservice in the COSMOS system
       required: true
-      description: The microservice name
-      values: .*
+      values: .+
   modifiers:
     ENV:
-      summary: Environment variable
+      summary: Sets an environment variable in the microservice.
       parameters:
-        - name: Name
+        - name: Key
           required: true
           description: Environment variable name
-          values: .*
+          values: .+
         - name: Value
           required: true
           description: Environment variable value
-          values: .*
+          values: .+
     WORK_DIR:
-      summary: Directory to start the microservice in (CWD)
+      summary: Set the working directory
+      description: Working directory to run the microservice CMD in.  Can be a path relative to the microservice folder in the plugin, or an absolute path in the container the microservice runs in.
       parameters:
-        - name: Path
+        - name: Directory
           required: true
-          description: Relative path from the target directory
-          values: .*
+          description: Working directory to run the microservice CMD in. Can be a path relative to the microservice folder in the plugin, or an absolute path in the container the microservice runs in.
+          values: .+
     TOPIC:
-      summary: Topic the microservice should process data from
+      summary: Associate a Redis topic
+      description: Redis topic to associate with this microservice. Standard COSMOS microservices such as decom_microservice use this information to know what packet streams to subscribe to. The TOPIC keyword can be used as many times as necessary to associate all needed topics.
       parameters:
-        - name: Name
+        - name: Topic Name
           required: true
-          description: Topic name
-          values: .*
+          description: Redis Topic to associate with the microservice
+          values: .+
     TARGET_NAME:
-      summary: Target which this microservice processes
+      summary: Associate a COSMOS target
+      description: COSMOS target to associate with the microservice. For standard COSMOS microservices such as decom_microservice this causes the target configuration to get loaded into the container for the microservice.
       parameters:
-        - name: Name
+        - name: Target Name
           required: true
-          description: Target name
-          values: .*
+          description: COSMOS target to associate with the microservice
+          values: .+
     CMD:
-      summary: Command to run which starts the microservice
+      summary: Command line to execute to run the microservice.
+      description: Command line to execute to run the microservice.
       parameters:
-        - name: Executable
+        - name: Args
           required: true
-          description: Executable to call
-          values: .*
-        - name: Command parameters
-          required: false
-          description: Additional parameters used by the command
+          description: One or more arguments to exec to run the microservice.
+          values: .+
     OPTION:
-      summary: Options to pass to the underlying microservice (used by InterfaceMicroservice, etc.)
+      summary: Pass an option to the microservice
+      description: Generic key/value(s) options to pass to the microservice. These take the form of KEYWORD/PARAMS like a line in a COSMOS configuration file. Multiple OPTION keywords can be used to pass multiple options to the microservice.
       parameters:
-        - name: Name
+        - name: Option Name
+          required: true
+          description: Name of the option
+          values: .+
+        - name: Option Value(s)
           required: true
-          description: Option name
-          values: .*
-        - name: Values
+          description: One or more values to associate with the option
+          values: .+
+    CONTAINER:
+      summary: Docker Container.
+      description: Container to execute and run the microservice in.
+      parameters:
+        - name: Args
           required: false
-          description: Option values
+          description: Name of the container
+          values: .+

data/data/config/plugins.yaml

@@ -65,153 +65,6 @@ ROUTER:
         <%= MetaConfigParser.load('_interfaces.yaml').to_meta_config_yaml(8) %>
       documentation: Additional parameters are required. Please see the [Interfaces](/docs/v5/interfaces)
         documentation for more details.
-TARGET:
-  summary: Define a target
-  description: Defines a target that the plugin adds to the COSMOS system.  Targets are entities that COSMOS can send commands to and receive telemetry from.
-  parameters:
-    - name: Target Folder Name
-      description: The exact name of the target folder in the plugin. ie. targets/<Target Folder Name>
-      required: true
-      values: .+
-    - name: Target Name
-      description: The specific name of this instance of the target in the COSMOS system
-      required: true
-      values: .+
-MICROSERVICE:
-  summary: Define a microservice
-  description: Defines a microservice that the plugin adds to the COSMOS system.  Microservices are background software processes that perform persistent processing.
-  parameters:
-    - name: Microservice Folder Name
-      description: The exact name of the microservice folder in the plugin. ie. microservices/<Microservice Folder Name>
-      required: true
-      values: .+
-    - name: Microservice Name
-      description: The specific name of this instance of the microservice in the COSMOS system
-      required: true
-      values: .+
-  modifiers:
-    ENV:
-      summary: Sets an environment variable in the microservice.
-      description: Sets an environment variable in the microservice.
-      parameters:
-        - name: Key
-          required: true
-          description: Name of the environment variable
-          values: .+
-        - name: Value
-          required: true
-          description: Value of the environment variable
-          values: .+
-    WORK_DIR:
-      summary: Set the working directory
-      description: Working directory to run the microservice CMD in.  Can be a path relative to the microservice folder in the plugin, or an absolute path in the container the microservice runs in.
-      parameters:
-        - name: Directory
-          required: true
-          description: Working directory to run the microservice CMD in.  Can be a path relative to the microservice folder in the plugin, or an absolute path in the container the microservice runs in.
-          values: .+
-    TOPIC:
-      summary: Associate a Redis topic
-      description: Redis topic to associate with this microservice.  Standard COSMOS microservices such as decom_microservice use this information to know what packet streams to subscribe to.  The TOPIC keyword can be used as many times as necessary to associate all needed topics.
-      parameters:
-        - name: Topic Name
-          required: true
-          description: Redis Topic to associate with the microservice
-          values: .+
-    TARGET_NAME:
-      summary: Associate a COSMOS target
-      description: COSMOS target to associate with the microservice.   For standard COSMOS microservices such as decom_microservice this causes the target configuration to get loaded into the container for the microservice.
-      parameters:
-        - name: Target Name
-          required: true
-          description: COSMOS target to associate with the microservice
-          values: .+
-    CMD:
-      summary: Command line to execute to run the microservice.
-      description: Command line to execute to run the microservice.
-      parameters:
-        - name: Args
-          required: true
-          description: One or more arguments to exec to run the microservice.
-          values: .+
-    CONTAINER:
-      summary: Docker Container.
-      description: Container to execute and run the microservice in.
-      parameters:
-        - name: Args
-          required: false
-          description: Name of the container
-          values: .+
-    OPTION:
-      summary: Pass an option to the microservice
-      description: Generic key/value(s) options to pass to the microservice.  These take the form of KEYWORD/PARAMS like a line in a COSMOS configuration file.  Multiple OPTION keywords can be used to pass multiple options to the microservice.
-      parameters:
-        - name: Option Name
-          required: true
-          description: Name of the option
-          values: .+
-        - name: Option Value(s)
-          required: true
-          description: One or more values to associate with the option
-          values: .+
-TOOL:
-  summary: Define a tool
-  description: Defines a tool that the plugin adds to the COSMOS system.  Tools are web based applications that make use of the Single-SPA javascript library that allows them to by dynamically added to the running system as independent frontend microservices.
-  parameters:
-    - name: Tool Folder Name
-      description: The exact name of the tool folder in the plugin. ie. tools/<Tool Folder Name>
-      required: true
-      values: .+
-    - name: Tool Name
-      description: Name of the tool that is displayed in the COSMOS Navigation menu
-      required: true
-      values: .+
-  modifiers:
-    URL:
-      summary: Url used to access the tool
-      description: The relative url used to access the tool.  Defaults to "/tools/<Tool Folder Name>".
-      parameters:
-        - name: Url
-          required: true
-          description: The url.  If not given defaults to tools/<Tool Folder Name>.  Generally should not be given unless linking to external tools.
-          values: .+
-    INLINE_URL:
-      summary: Internal url to load a tool
-      description: The url of the javascript file used to load the tool into single-SPA.  Defaults to "js/app.js".
-      parameters:
-        - name: Url
-          required: true
-          description: The inline url.  If not given defaults to js/app.js.  Generally should not be given unless using a non-standard filename.
-          values: .+
-    WINDOW:
-      summary: How to display the tool when navigated to
-      description: The window mode used to display the tool.  Currently supported modes are INLINE which opens the tool internally without refreshing the page using the Single-SPA framework, and NEW which opens the tool in a new TAB.   A future release will support IFRAME to open external tools in an Iframe within COSMOS.
-      parameters:
-        - name: Window Mode
-          required: true
-          description: INLINE, NEW, or IFRAME
-          values: .+
-    ICON:
-      summary: Set tool icon
-      description: Icon shown next to the tool name in the COSMOS navigation menu.
-      parameters:
-        - name: Icon Name
-          required: true
-          description: Icon to display next to the tool name.   Icons come from Font Awesome, Material Design, and Astro.  See https://vuetifyjs.com/en/components/icons/
-          values: .+
-    CATEGORY:
-      summary: Category for the tool
-      description: Associates the tool with a category.  In a future release this will be able to organize tools into submenus in the Navigation menu.
-      parameters:
-        - name: Category Name
-          required: true
-          description: Category to associate the tool with
-          values: .+
-    SHOWN:
-      summary: Show the tool or not
-      description: Whether or not the tool is shown in the Navigation menu.   Should generally be true, except for the cosmos base tool.
-      parameters:
-        - name: Shown
-          required: true
-          description: Whether or not the tool is shown.  TRUE or FALSE
-          values: .+
+<%= MetaConfigParser.load('target.yaml').to_meta_config_yaml() %>
+<%= MetaConfigParser.load('microservice.yaml').to_meta_config_yaml() %>
+<%= MetaConfigParser.load('tool.yaml').to_meta_config_yaml() %>

data/data/config/target.yaml

@@ -28,6 +28,13 @@ TARGET:
           required: true
           description: Maximum file size in bytes (default = 50_000_000)
           values: \d+
+    CMD_LOG_RETAIN_TIME:
+      summary: How long to keep raw command logs in seconds.
+      parameters:
+        - name: Time
+          required: true
+          description: Number of seconds to keep raw command logs (default = nil = Forever)
+          values: \d+
     CMD_DECOM_LOG_CYCLE_TIME:
       summary: Command decommutation logs can be cycled on a time interval.
       parameters:
@@ -42,6 +49,13 @@ TARGET:
           required: true
           description: Maximum file size in bytes (default = 50_000_000)
           values: \d+
+    CMD_DECOM_LOG_RETAIN_TIME:
+      summary: How long to keep decom command logs in seconds.
+      parameters:
+        - name: Time
+          required: true
+          description: Number of seconds to keep decom command logs (default = nil = Forever)
+          values: \d+
     TLM_LOG_CYCLE_TIME:
       summary: Telemetry binary logs can be cycled on a time interval.
       parameters:
@@ -56,6 +70,13 @@ TARGET:
           required: true
           description: Maximum file size in bytes (default = 50_000_000)
           values: \d+
+    TLM_LOG_RETAIN_TIME:
+      summary: How long to keep raw telemetry logs in seconds.
+      parameters:
+        - name: Time
+          required: true
+          description: Number of seconds to keep raw telemetry logs (default = nil = Forever)
+          values: \d+
     TLM_DECOM_LOG_CYCLE_TIME:
       summary: Telemetry decommutation logs can be cycled on a time interval.
       parameters:
@@ -70,3 +91,52 @@ TARGET:
           required: true
           description: Maximum file size in bytes (default = 50_000_000)
           values: \d+
+    TLM_DECOM_LOG_RETAIN_TIME:
+      summary: How long to keep decom telemetry logs in seconds.
+      parameters:
+        - name: Time
+          required: true
+          description: Number of seconds to keep decom telemetry logs (default = nil = Forever)
+          values: \d+
+    REDUCED_MINUTE_LOG_RETAIN_TIME:
+      summary: How long to keep reduced minute telemetry logs in seconds.
+      parameters:
+        - name: Time
+          required: true
+          description: Number of seconds to keep reduced minute telemetry logs (default = nil = Forever)
+          values: \d+
+    REDUCED_HOUR_LOG_RETAIN_TIME:
+      summary: How long to keep reduced hour telemetry logs in seconds.
+      parameters:
+        - name: Time
+          required: true
+          description: Number of seconds to keep reduced hour telemetry logs (default = nil = Forever)
+          values: \d+
+    REDUCED_DAY_LOG_RETAIN_TIME:
+      summary: How long to keep reduced day telemetry logs in seconds.
+      parameters:
+        - name: Time
+          required: true
+          description: Number of seconds to keep reduced day telemetry logs (default = nil = Forever)
+          values: \d+
+    LOG_RETAIN_TIME:
+      summary: How long to keep all regular telemetry logs in seconds.
+      parameters:
+        - name: Time
+          required: true
+          description: Number of seconds to keep all regular telemetry logs (default = nil = Forever)
+          values: \d+
+    REDUCED_LOG_RETAIN_TIME:
+      summary: How long to keep all reduced telemetry logs in seconds.
+      parameters:
+        - name: Time
+          required: true
+          description: Number of seconds to keep all reduced telemetry logs (default = nil = Forever)
+          values: \d+
+    CLEANUP_POLL_TIME:
+      summary: Period at which to run the cleanup process.
+      parameters:
+        - name: Time
+          required: true
+          description: Number of seconds between runs of the cleanup process (default = 900 = 15 minutes)
+          values: \d+

data/data/config/tool.yaml

@@ -1,57 +1,63 @@
 ---
 TOOL:
-  summary: Defines a new tool
+  summary: Define a tool
   example: TOOL DEMO Demo
+  description: Defines a tool that the plugin adds to the COSMOS system. Tools are web based applications that make use of the Single-SPA javascript library that allows them to by dynamically added to the running system as independent frontend microservices.
   parameters:
-    - name: Folder Name
+    - name: Tool Folder Name
+      description: The exact name of the tool folder in the plugin. ie. tools/<Tool Folder Name>
       required: true
-      description: The folder where the tool is located relative to the tools folder in the plugin
-      values: .*
-    - name: Name
+      values: .+
+    - name: Tool Name
+      description: Name of the tool that is displayed in the COSMOS Navigation menu
       required: true
-      description: The tool name displayed in the Nav bar
-      values: .*
+      values: .+
   modifiers:
     URL:
-      summary: Url to reach the tool relative to the tools Folder Name, or absolute
+      summary: Url used to access the tool
+      description: The relative url used to access the tool. Defaults to "/tools/<Tool Folder Name>".
       parameters:
-        - name: URL
+        - name: Url
           required: true
-          description: URL
-          values: .*
+          description: The url. If not given defaults to tools/<Tool Folder Name>. Generally should not be given unless linking to external tools.
+          values: .+
     INLINE_URL:
-      summary: Single SPA url to reach the tool
-      example: js/app.js
+      summary: Internal url to load a tool
+      description: The url of the javascript file used to load the tool into single-SPA. Defaults to "js/app.js".
       parameters:
-        - name: URL
+        - name: Url
           required: true
-          description: URL
-          values: .*
-    ICON:
-      summary: Icon used to display the tool link
-      parameters:
-        - name: Name
-          required: true
-          description: Material design icon name (https://materialdesignicons.com/)
-          values: .*
+          description: The inline url. If not given defaults to js/app.js. Generally should not be given unless using a non-standard filename.
+          values: .+
     WINDOW:
-      summary: How the tool should be displayed
+      summary: How to display the tool when navigated to
+      description: The window mode used to display the tool. INLINE opens the tool internally without refreshing the page using the Single-SPA framework. IFRAME opens external tools in an Iframe within COSMOS. NEW opens the tool in a new TAB.
       parameters:
-        - name: Mode
+        - name: Window Mode
           required: true
           description: Tool display mode
           values: ["INLINE", "IFRAME", "NEW"]
+    ICON:
+      summary: Set tool icon
+      description: Icon shown next to the tool name in the COSMOS navigation menu.
+      parameters:
+        - name: Icon Name
+          required: true
+          description: Icon to display next to the tool name. Icons come from Font Awesome, Material Design (https://materialdesignicons.com/), and Astro.
+          values: .+
     CATEGORY:
-      summary: Category to place the tool into
+      summary: Category for the tool
+      description: Associates the tool with a category. In a future release this will be able to organize tools into submenus in the Navigation menu.
       parameters:
-        - name: Category
+        - name: Category Name
           required: true
-          description: Name of a category to organize a tool into
-          values: .*
+          description: Category to associate the tool with
+          values: .+
     SHOWN:
-      summary: Is the Tool Shown in the Nav Bar
+      summary: Show the tool or not
+      description: Whether or not the tool is shown in the Navigation menu. Should generally be true, except for the cosmos base tool.
       parameters:
         - name: Shown
           required: true
-          description: Is Shown?
+          description: Whether or not the tool is shown.  TRUE or FALSE
           values: ["true", "false"]

data/lib/cosmos/api/cmd_api.rb

@@ -35,6 +35,7 @@ module Cosmos
                        'cmd_raw_no_checks',
                        'send_raw',
                        'get_all_commands',
+                       'get_all_commands_list',
                        'get_command',
                        'get_parameter',
                        'get_cmd_buffer',
@@ -212,6 +213,16 @@ module Cosmos
       TargetModel.packets(target_name, type: :CMD, scope: scope)
     end
 
+    # Returns an array of all the command names and their descriptions
+    #
+    # @since 5.0.3
+    # @param target_name [String] Name of the target
+    # @return [Array<Hash>] Array of all commands as a hash
+    def get_all_commands_list(target_name, scope: $cosmos_scope, token: $cosmos_token)
+      authorize(permission: 'cmd_info', target_name: target_name, scope: scope, token: token)
+      TargetModel.all_packet_name_descriptions(target_name, type: :CMD, scope: scope)
+    end
+
     # Returns a hash of the given command
     #
     # @since 5.0.0

data/lib/cosmos/api/tlm_api.rb

@@ -19,6 +19,8 @@
 
 require 'cosmos/models/target_model'
 require 'cosmos/models/cvt_model'
+require 'cosmos/packets/packet'
+require 'cosmos/topics/telemetry_topic'
 require 'cosmos/utilities/s3'
 
 module Cosmos
@@ -38,10 +40,11 @@ module Cosmos
                        'get_tlm_packet',
                        'get_tlm_values',
                        'get_all_telemetry',
+                       'get_all_telemetry_list',
                        'get_telemetry',
                        'get_item',
                        'subscribe_packets',
-                       'get_packet',
+                       'get_packets',
                        'get_all_tlm_info',
                        'get_tlm_cnt',
                        'get_packet_derived_items',
@@ -125,19 +128,18 @@ module Cosmos
         # Check that the packet exists ... exceptions are raised if not
         TargetModel.packet(target_name, packet_name, scope: scope)
       end
-      inject = {}
-      inject['inject_tlm'] = true
-      inject['log'] = log
-      inject['target_name'] = target_name
-      inject['packet_name'] = packet_name
-      inject['item_hash'] = JSON.generate(item_hash) if item_hash
-      inject['type'] = type
-
-      InterfaceModel.all(scope: scope).each do |name, interface|
-        if interface['target_names'].include? target_name
-          Store.write_topic("{#{scope}__CMD}INTERFACE__#{interface['name']}", inject, '*', 100)
+
+      packet_hash = get_telemetry(target_name, packet_name, scope: scope, token: token)
+      packet = Packet.from_json(packet_hash)
+      if item_hash
+        item_hash.each do |name, value|
+          packet.write(name.to_s, value, type)
         end
       end
+      packet.received_time = Time.now.sys
+      # TODO: New packet so received_count is not correct
+      packet.received_count += 1
+      TelemetryTopic.write_packet(packet, scope: scope)
     end
 
     # Override the current value table such that a particular item always
@@ -245,7 +247,17 @@ module Cosmos
     # @return [Array<Hash>] Array of all telemetry packet hashes
     def get_all_telemetry(target_name, scope: $cosmos_scope, token: $cosmos_token)
       authorize(permission: 'tlm', target_name: target_name, scope: scope, token: token)
-      TargetModel.packets(target_name, scope: scope)
+      TargetModel.packets(target_name, type: :TLM, scope: scope)
+    end
+
+    # Returns an array of all telemetry packet's name and descriptions
+    #
+    # @since 5.0.3
+    # @param target_name [String] Name of the target
+    # @return [Array<Hash>] Array of all telemetry packet name and descriptions
+    def get_all_telemetry_list(target_name, scope: $cosmos_scope, token: $cosmos_token)
+      authorize(permission: 'tlm', target_name: target_name, scope: scope, token: token)
+      TargetModel.all_packet_name_descriptions(target_name, type: :TLM, scope: scope)
     end
 
     # Returns a telemetry packet hash
@@ -271,41 +283,53 @@ module Cosmos
       TargetModel.packet_item(target_name, packet_name, item_name, scope: scope)
     end
 
+    # 2x double underscore since __ is reserved
+    SUBSCRIPTION_DELIMITER = '____'
+
     # Subscribe to a list of packets. An ID is returned which is passed to
-    # get_packet(id) to yield packets back to a block.
+    # get_packets(id) to return packets.
     #
     # @param packets [Array<Array<String, String>>] Array of arrays consisting of target name, packet name
-    # @return [String] ID which should be passed to get_packet
+    # @return [String] ID which should be passed to get_packets
     def subscribe_packets(packets, scope: $cosmos_scope, token: $cosmos_token)
       if !packets.is_a?(Array) || !packets[0].is_a?(Array)
         raise ArgumentError, "packets must be nested array: [['TGT','PKT'],...]"
       end
 
-      result = [Time.now.to_nsec_from_epoch]
+      result = {}
       packets.each do |target_name, packet_name|
         authorize(permission: 'tlm', target_name: target_name, packet_name: packet_name, scope: scope, token: token)
-        result << "#{scope}__DECOM__{#{target_name}}__#{packet_name}"
+        topic = "#{scope}__DECOM__{#{target_name}}__#{packet_name}"
+        id, _ = Store.read_topic_last(topic)
+        result[topic] = id ? id : '0-0'
       end
-      result.join("\n")
+      result.to_a.join(SUBSCRIPTION_DELIMITER)
     end
     # Alias the singular as well since that matches COSMOS 4
     alias subscribe_packet subscribe_packets
 
-    # Get a packet which was previously subscribed to by subscribe_packet.
-    # This method takes a block and yields back packet hashes.
-    def get_packet(id, scope: $cosmos_scope, token: $cosmos_token)
+    # Get packets based on ID returned from subscribe_packet.
+    # @param id [String] ID returned from subscribe_packets or last call to get_packets
+    # @param block [Integer] Number of milliseconds to block when requesting packets
+    # @param count [Integer] Maximum number of packets to return from EACH packet stream
+    # @return [Array<String, Array<Hash>] Array of the ID and array of all packets found
+    def get_packets(id, block: nil, count: 1000, scope: $cosmos_scope, token: $cosmos_token)
       authorize(permission: 'tlm', scope: scope, token: token)
-      offset, *topics = id.split("\n")
-      offsets = []
-      # Create a common array of offsets for each of the topics
-      topics.length.times do
-        offsets << (offset.to_i / 1_000_000).to_s + '-0'
-      end
-      Topic.read_topics(topics, offsets) do |topic, msg_id, msg_hash, redis|
-        json_hash = JSON.parse(msg_hash['json_data'])
-        msg_hash.delete('json_data')
-        yield msg_hash.merge(json_hash)
+      # Split the list of topic, ID values and turn it into a hash for easy updates
+      lookup = Hash[*id.split(SUBSCRIPTION_DELIMITER)]
+      xread = Store.xread(lookup.keys, lookup.values, block: block, count: count)
+      # Return the original ID and nil if we didn't get anything
+      return [id, nil] if xread.empty?
+      packets = []
+      xread.each do |topic, data|
+        data.each do |id, msg_hash|
+          lookup[topic] = id # Store the new ID
+          json_hash = JSON.parse(msg_hash['json_data'])
+          msg_hash.delete('json_data')
+          packets << msg_hash.merge(json_hash)
+        end
       end
+      return [lookup.to_a.join(SUBSCRIPTION_DELIMITER), packets]
     end
 
     # Get the receive count for a telemetry packet
@@ -336,7 +360,7 @@ module Cosmos
         key = "#{scope}__TELEMETRY__{#{x}}__#{x}"
         result << [x, x, _get_cnt(key)]
       end
-      # Return the results sorted by target, packet
+      # Return the result sorted by target, packet
       result.sort_by { |a| [a[0], a[1]] }
     end