cosmos 5.0.2 → 5.0.5

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/ext/cosmos/ext/cosmos_io/cosmos_io.c

@@ -30,19 +30,19 @@ VALUE mCosmosIO = Qnil;
 static ID id_method_read = 0;
 
 /* Reads a length field and then return the String resulting from reading the
-  * number of bytes the length field indicates
-  *
-  * For example:
-  *   io = StringIO.new
-  *   # where io is "\x02\x01\x02\x03\x04...."
-  *   result = io.read_length_bytes(1)
-  *   # result will be "\x01x02" because the length field was given
-  *   # to be 1 byte. We read 1 byte which is a 2. So we then read two
-  *   # bytes and return.
-  *
-  * @param length_num_bytes [Integer] Number of bytes in the length field
-  * @return [String] A String of "length field" number of bytes
-  */
+ * number of bytes the length field indicates
+ *
+ * For example:
+ *   io = StringIO.new
+ *   # where io is "\x02\x01\x02\x03\x04...."
+ *   result = io.read_length_bytes(1)
+ *   # result will be "\x01x02" because the length field was given
+ *   # to be 1 byte. We read 1 byte which is a 2. So we then read two
+ *   # bytes and return.
+ *
+ * @param length_num_bytes [Integer] Number of bytes in the length field
+ * @return [String] A String of "length field" number of bytes
+ */
 static VALUE read_length_bytes(int argc, VALUE *argv, VALUE self)
 {
   int length_num_bytes = 0;
@@ -134,7 +134,7 @@ static VALUE read_length_bytes(int argc, VALUE *argv, VALUE self)
   }
 
   /* Read String */
-  temp_string_length = UINT2NUM(string_length);
+  temp_string_length = UINT2NUM((unsigned int)string_length);
   return_value = rb_funcall(self, id_method_read, 1, temp_string_length);
   if (NIL_P(return_value) || (RSTRING_LEN(return_value) != string_length))
   {

data/ext/cosmos/ext/packet/packet.c

@@ -196,7 +196,7 @@ static VALUE packet_initialize(int argc, VALUE *argv, VALUE self)
     packet_name = argv[1];
     default_endianness = symbol_BIG_ENDIAN;
     description = Qnil;
-    buffer = rb_str_new2("");
+    buffer = Qnil;
     item_class = cPacketItem;
     break;
   case 3:
@@ -204,7 +204,7 @@ static VALUE packet_initialize(int argc, VALUE *argv, VALUE self)
     packet_name = argv[1];
     default_endianness = argv[2];
     description = Qnil;
-    buffer = rb_str_new2("");
+    buffer = Qnil;
     item_class = cPacketItem;
     break;
   case 4:
@@ -212,7 +212,7 @@ static VALUE packet_initialize(int argc, VALUE *argv, VALUE self)
     packet_name = argv[1];
     default_endianness = argv[2];
     description = argv[3];
-    buffer = rb_str_new2("");
+    buffer = Qnil;
     item_class = cPacketItem;
     break;
   case 5:

data/ext/cosmos/ext/structure/structure.c

@@ -56,6 +56,7 @@ static ID id_method_reverse = 0;
 static ID id_method_Integer = 0;
 static ID id_method_Float = 0;
 static ID id_method_kind_of = 0;
+static ID id_method_allocate_buffer_if_needed = 0;
 
 static ID id_ivar_buffer = 0;
 static ID id_ivar_bit_offset = 0;
@@ -520,7 +521,8 @@ static VALUE binary_accessor_read(VALUE self, VALUE param_bit_offset, VALUE para
     {
       string_length = upper_bound - lower_bound + 1;
       string = malloc(string_length + 1);
-      if (string == NULL) {
+      if (string == NULL)
+      {
         rb_raise(rb_eNoMemError, "malloc of %d returned NULL", string_length + 1);
       }
       memcpy(string, buffer + lower_bound, string_length);
@@ -577,7 +579,8 @@ static VALUE binary_accessor_read(VALUE self, VALUE param_bit_offset, VALUE para
       string_length = ((bit_size - 1) / 8) + 1;
       array_length = string_length + 4; /* Required number of bytes plus slack */
       unsigned_char_array = (unsigned char *)malloc(array_length);
-      if (unsigned_char_array == NULL) {
+      if (unsigned_char_array == NULL)
+      {
         rb_raise(rb_eNoMemError, "malloc of %d returned NULL", array_length);
       }
       read_bitfield(lower_bound, upper_bound, bit_offset, bit_size, given_bit_offset, given_bit_size, param_endianness, buffer, (int)buffer_length, unsigned_char_array);
@@ -692,7 +695,8 @@ static VALUE binary_accessor_read(VALUE self, VALUE param_bit_offset, VALUE para
       string_length = ((bit_size - 1) / 8) + 1;
       array_length = string_length + 4; /* Required number of bytes plus slack */
       unsigned_char_array = (unsigned char *)malloc(array_length);
-      if (unsigned_char_array == NULL) {
+      if (unsigned_char_array == NULL)
+      {
         rb_raise(rb_eNoMemError, "malloc of %d returned NULL", array_length);
       }
       read_bitfield(lower_bound, upper_bound, bit_offset, bit_size, given_bit_offset, given_bit_size, param_endianness, buffer, (int)buffer_length, unsigned_char_array);
@@ -1147,7 +1151,8 @@ static VALUE binary_accessor_write(VALUE self, VALUE value, VALUE param_bit_offs
       string_length = ((bit_size - 1) / 8) + 1;
       array_length = string_length + 4; /* Required number of bytes plus slack */
       unsigned_char_array = (unsigned char *)malloc(array_length);
-      if (unsigned_char_array == NULL) {
+      if (unsigned_char_array == NULL)
+      {
         rb_raise(rb_eNoMemError, "malloc of %d returned NULL", array_length);
       }
 
@@ -1275,15 +1280,8 @@ static VALUE binary_accessor_write(VALUE self, VALUE value, VALUE param_bit_offs
  */
 static int get_int_length(VALUE self)
 {
-  volatile VALUE buffer = rb_ivar_get(self, id_ivar_buffer);
-  if (RTEST(buffer))
-  {
-    return (int)RSTRING_LEN(buffer);
-  }
-  else
-  {
-    return 0;
-  }
+  rb_funcall(self, id_method_allocate_buffer_if_needed, 0);
+  return (int)RSTRING_LEN(rb_ivar_get(self, id_ivar_buffer));
 }
 
 /*
@@ -1310,24 +1308,21 @@ static VALUE read_item_internal(VALUE self, VALUE item, VALUE buffer)
     return Qnil;
   }
 
-  if (RTEST(buffer))
+  if (!(RTEST(buffer)))
   {
-    bit_offset = rb_ivar_get(item, id_ivar_bit_offset);
-    bit_size = rb_ivar_get(item, id_ivar_bit_size);
-    array_size = rb_ivar_get(item, id_ivar_array_size);
-    endianness = rb_ivar_get(item, id_ivar_endianness);
-    if (RTEST(array_size))
-    {
-      return rb_funcall(cBinaryAccessor, id_method_read_array, 6, bit_offset, bit_size, data_type, array_size, buffer, endianness);
-    }
-    else
-    {
-      return binary_accessor_read(cBinaryAccessor, bit_offset, bit_size, data_type, buffer, endianness);
-    }
+    buffer = rb_funcall(self, id_method_allocate_buffer_if_needed, 0);
+  }
+  bit_offset = rb_ivar_get(item, id_ivar_bit_offset);
+  bit_size = rb_ivar_get(item, id_ivar_bit_size);
+  array_size = rb_ivar_get(item, id_ivar_array_size);
+  endianness = rb_ivar_get(item, id_ivar_endianness);
+  if (RTEST(array_size))
+  {
+    return rb_funcall(cBinaryAccessor, id_method_read_array, 6, bit_offset, bit_size, data_type, array_size, buffer, endianness);
   }
   else
   {
-    rb_raise(rb_eRuntimeError, "No buffer given to read_item");
+    return binary_accessor_read(cBinaryAccessor, bit_offset, bit_size, data_type, buffer, endianness);
   }
 }
 
@@ -1404,8 +1399,8 @@ static VALUE structure_item_spaceship(VALUE self, VALUE other_item)
   if ((bit_offset == 0) && (other_bit_offset == 0))
   {
     /* Both bit_offsets are 0 so sort by bit_size
-      * This allows derived items with bit_size of 0 to be listed first
-      * Compare based on bit size */
+     * This allows derived items with bit_size of 0 to be listed first
+     * Compare based on bit size */
     bit_size = FIX2INT(rb_ivar_get(self, id_ivar_bit_size));
     other_bit_size = FIX2INT(rb_ivar_get(other_item, id_ivar_bit_size));
     if (bit_size == other_bit_size)
@@ -1518,12 +1513,12 @@ static VALUE structure_initialize(int argc, VALUE *argv, VALUE self)
   {
   case 0:
     default_endianness = HOST_ENDIANNESS;
-    buffer = rb_str_new2("");
+    buffer = Qnil;
     item_class = cStructureItem;
     break;
   case 1:
     default_endianness = argv[0];
-    buffer = rb_str_new2("");
+    buffer = Qnil;
     item_class = cStructureItem;
     break;
   case 2:
@@ -1592,6 +1587,10 @@ static VALUE resize_buffer(VALUE self)
       rb_str_concat(buffer, rb_str_times(ZERO_STRING, INT2FIX(defined_length - current_length)));
     }
   }
+  else
+  {
+    rb_funcall(self, id_method_allocate_buffer_if_needed, 0);
+  }
 
   return self;
 }
@@ -1618,6 +1617,7 @@ void Init_structure(void)
   id_method_Integer = rb_intern("Integer");
   id_method_Float = rb_intern("Float");
   id_method_kind_of = rb_intern("kind_of?");
+  id_method_allocate_buffer_if_needed = rb_intern("allocate_buffer_if_needed");
 
   MIN_INT8 = INT2NUM(-128);
   MAX_INT8 = INT2NUM(127);

data/lib/cosmos/api/api.rb

@@ -28,36 +28,12 @@ require 'cosmos/api/settings_api'
 require 'cosmos/api/target_api'
 require 'cosmos/api/tlm_api'
 require 'cosmos/utilities/authorization'
+require 'cosmos/topics/topic'
 
 module Cosmos
   module Api
     include Extract
     include Authorization
     include ApiShared
-
-    # PRIVATE - Shared by cmd_api and tlm_api
-
-    def _get_cnt(topic)
-      _, packet = Store.instance.read_topic_last(topic)
-      packet ? packet["received_count"].to_i : 0
-    end
-
-    def get_all_cmd_tlm_info(type, scope:, token:)
-      authorize(permission: 'system', scope: scope, token: token)
-      result = []
-      keys = []
-      count = 0
-      loop do
-        count, part = Store.scan(0, :match => "#{scope}__#{type}__*", :count => 1000)
-        keys.concat(part)
-        break if count.to_i == 0
-      end
-      keys.each do |key|
-        _, _, target, packet = key.gsub(/{|}/, '').split('__') # split off scope and type
-        result << [target, packet, _get_cnt(key)]
-      end
-      # Return the results sorted by target, packet
-      result.sort_by { |a| [a[0], a[1]] }
-    end
   end
 end

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',
@@ -194,7 +195,7 @@ module Cosmos
       authorize(permission: 'cmd_info', target_name: target_name, packet_name: command_name, scope: scope, token: token)
       TargetModel.packet(target_name, command_name, type: :CMD, scope: scope)
       topic = "#{scope}__COMMAND__{#{target_name}}__#{command_name}"
-      msg_id, msg_hash = Store.instance.read_topic_last(topic)
+      msg_id, msg_hash = Topic.get_newest_message(topic)
       if msg_id
         msg_hash['buffer'] = msg_hash['buffer'].b
         return msg_hash
@@ -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
@@ -291,7 +302,7 @@ module Cosmos
     # @return [Varies] value
     def get_cmd_value(target_name, command_name, parameter_name, value_type = :CONVERTED, scope: $cosmos_scope, token: $cosmos_token)
       authorize(permission: 'cmd_info', target_name: target_name, packet_name: command_name, scope: scope, token: token)
-      Store.instance.get_cmd_item(target_name, command_name, parameter_name, type: value_type, scope: scope)
+      CommandDecomTopic.get_cmd_item(target_name, command_name, parameter_name, type: value_type, scope: scope)
     end
 
     # Returns the time the most recent command was sent
@@ -304,7 +315,7 @@ module Cosmos
     def get_cmd_time(target_name = nil, command_name = nil, scope: $cosmos_scope, token: $cosmos_token)
       authorize(permission: 'cmd_info', target_name: target_name, packet_name: command_name, scope: scope, token: token)
       if target_name and command_name
-        time = Store.instance.get_cmd_item(target_name, command_name, 'RECEIVED_TIMESECONDS', type: :CONVERTED, scope: scope)
+        time = CommandDecomTopic.get_cmd_item(target_name, command_name, 'RECEIVED_TIMESECONDS', type: :CONVERTED, scope: scope)
         [target_name, command_name, time.to_i, ((time.to_f - time.to_i) * 1_000_000).to_i]
       else
         if target_name.nil?
@@ -316,7 +327,7 @@ module Cosmos
           time = 0
           command_name = nil
           TargetModel.packets(target_name, type: :CMD, scope: scope).each do |packet|
-            cur_time = Store.instance.get_cmd_item(target_name, packet["packet_name"], 'RECEIVED_TIMESECONDS', type: :CONVERTED, scope: scope)
+            cur_time = CommandDecomTopic.get_cmd_item(target_name, packet["packet_name"], 'RECEIVED_TIMESECONDS', type: :CONVERTED, scope: scope)
             next unless cur_time
 
             if cur_time > time
@@ -338,7 +349,7 @@ module Cosmos
     def get_cmd_cnt(target_name, command_name, scope: $cosmos_scope, token: $cosmos_token)
       authorize(permission: 'system', target_name: target_name, packet_name: command_name, scope: scope, token: token)
       TargetModel.packet(target_name, command_name, type: :CMD, scope: scope)
-      _get_cnt("#{scope}__COMMAND__{#{target_name}}__#{command_name}")
+      Topic.get_cnt("#{scope}__COMMAND__{#{target_name}}__#{command_name}")
     end
 
     # Get information on all command packets
@@ -351,7 +362,7 @@ module Cosmos
         TargetModel.packets(target_name, type: :CMD, scope: scope).each do | packet |
           command_name = packet['packet_name']
           key = "#{scope}__COMMAND__{#{target_name}}__#{command_name}"
-          result << [target_name, command_name, _get_cnt(key)]
+          result << [target_name, command_name, Topic.get_cnt(key)]
         end
       end
       # Return the results sorted by target, packet

data/lib/cosmos/api/config_api.rb

@@ -17,6 +17,8 @@
 # enterprise edition license of COSMOS if purchased from the
 # copyright holder
 
+require 'cosmos/models/tool_config_model'
+
 module Cosmos
   module Api
     WHITELIST ||= []
@@ -34,19 +36,23 @@ module Cosmos
     end
 
     def list_configs(tool, scope: $cosmos_scope, token: $cosmos_token)
-      Store.instance.hkeys("#{scope}__config__#{tool}")
+      authorize(permission: 'system', scope: scope, token: token)
+      ToolConfigModel.list_configs(tool, scope: scope)
     end
 
     def load_config(tool, name, scope: $cosmos_scope, token: $cosmos_token)
-      Store.instance.hget("#{scope}__config__#{tool}", name)
+      authorize(permission: 'system', scope: scope, token: token)
+      ToolConfigModel.load_config(tool, name, scope: scope)
     end
 
     def save_config(tool, name, data, scope: $cosmos_scope, token: $cosmos_token)
-      Store.instance.hset("#{scope}__config__#{tool}", name, data)
+      authorize(permission: 'system_set', scope: scope, token: token)
+      ToolConfigModel.save_config(tool, name, data, scope: scope)
     end
 
     def delete_config(tool, name, scope: $cosmos_scope, token: $cosmos_token)
-      Store.instance.hdel("#{scope}__config__#{tool}", name)
+      authorize(permission: 'system_set', scope: scope, token: token)
+      ToolConfigModel.delete_config(tool, name, scope: scope)
     end
   end
 end

data/lib/cosmos/api/limits_api.rb

@@ -64,7 +64,7 @@ module Cosmos
       targets.each do |target_name|
         get_all_telemetry(target_name, scope: scope).each do |packet|
           topic = "#{scope}__TELEMETRY__{#{target_name}}__#{packet['packet_name']}"
-          _, msg_hash = Store.get_newest_message(topic)
+          _, msg_hash = Topic.get_newest_message(topic)
           unless msg_hash && msg_hash['time'].to_i > stale_time
             next if with_limits_only && packet['items'].find { |item| item['limits'] }.nil?
 

data/lib/cosmos/api/settings_api.rb

@@ -19,8 +19,6 @@
 
 module Cosmos
   module Api
-    SETTINGS_KEY = "cosmos__settings"
-
     WHITELIST ||= []
     WHITELIST.concat([
                        'list_settings',
@@ -31,28 +29,42 @@ module Cosmos
                      ])
 
     def list_settings(scope: $cosmos_scope, token: $cosmos_token)
-      Store.instance.hkeys(SETTINGS_KEY)
+      authorize(permission: 'system', scope: scope, token: token)
+      SettingsModel.names(scope: scope)
     end
 
     def get_all_settings(scope: $cosmos_scope, token: $cosmos_token)
-      Store.instance.hgetall(SETTINGS_KEY)
+      authorize(permission: 'system', scope: scope, token: token)
+      SettingsModel.all(scope: scope)
     end
 
     def get_setting(name, scope: $cosmos_scope, token: $cosmos_token)
-      Store.instance.hget(SETTINGS_KEY, name)
+      authorize(permission: 'system', scope: scope, token: token)
+      setting = SettingsModel.get(name: name, scope: scope)
+      if setting
+        return setting["data"]
+      else
+        return nil
+      end
     end
 
     def get_settings(*args, scope: $cosmos_scope, token: $cosmos_token)
+      authorize(permission: 'system', scope: scope, token: token)
       ret = []
       args.each do |name|
-        ret << Store.instance.hget(SETTINGS_KEY, name)
+        setting = SettingsModel.get(name: name, scope: scope)
+        if setting
+          ret << setting["data"]
+        else
+          ret << nil
+        end
       end
       return ret
     end
 
     def save_setting(name, data, scope: $cosmos_scope, token: $cosmos_token)
       authorize(permission: 'admin', scope: scope, token: token)
-      Store.instance.hset(SETTINGS_KEY, name, data)
+      SettingsModel.set({ name: name,  data: data }, scope: scope)
     end
   end
 end

data/lib/cosmos/api/target_api.rb

@@ -56,12 +56,12 @@ module Cosmos
         cmd_cnt = 0
         packets = TargetModel.packets(target_name, type: :CMD, scope: scope)
         packets.each do |packet|
-          cmd_cnt += _get_cnt("#{scope}__COMMAND__{#{target_name}}__#{packet['packet_name']}")
+          cmd_cnt += Topic.get_cnt("#{scope}__COMMAND__{#{target_name}}__#{packet['packet_name']}")
         end
         tlm_cnt = 0
         packets = TargetModel.packets(target_name, type: :TLM, scope: scope)
         packets.each do |packet|
-          tlm_cnt += _get_cnt("#{scope}__TELEMETRY__{#{target_name}}__#{packet['packet_name']}")
+          tlm_cnt += Topic.get_cnt("#{scope}__TELEMETRY__{#{target_name}}__#{packet['packet_name']}")
         end
         interface_name = ''
         InterfaceModel.all(scope: scope).each do |name, interface|