cosmos 5.0.2 → 5.0.5

data/lib/cosmos/utilities/store_autoload.rb

@@ -31,7 +31,7 @@ end
 module Cosmos
   class Store
     # Variable that holds the singleton instance
-    @@instance = nil
+    @instance = nil
 
     # Mutex used to ensure that only one instance is created
     @@instance_mutex = Mutex.new
@@ -42,11 +42,11 @@ module Cosmos
     # Get the singleton instance
     def self.instance(pool_size = 100)
       # Logger.level = Logger::DEBUG
-      return @@instance if @@instance
+      return @instance if @instance
 
       @@instance_mutex.synchronize do
-        @@instance ||= self.new(pool_size)
-        return @@instance
+        @instance ||= self.new(pool_size)
+        return @instance
       end
     end
 
@@ -87,44 +87,10 @@ module Cosmos
       end
     end
 
-    def get_cmd_item(target_name, packet_name, param_name, type: :WITH_UNITS, scope: $cosmos_scope)
-      msg_id, msg_hash = read_topic_last("#{scope}__DECOMCMD__{#{target_name}}__#{packet_name}")
-      if msg_id
-        # TODO: We now have these reserved items directly on command packets
-        # Do we still calculate from msg_hash['time'] or use the times directly?
-        #
-        # if param_name == 'RECEIVED_TIMESECONDS' || param_name == 'PACKET_TIMESECONDS'
-        #   Time.from_nsec_from_epoch(msg_hash['time'].to_i).to_f
-        # elsif param_name == 'RECEIVED_TIMEFORMATTED' || param_name == 'PACKET_TIMEFORMATTED'
-        #   Time.from_nsec_from_epoch(msg_hash['time'].to_i).formatted
-        if param_name == 'RECEIVED_COUNT'
-          msg_hash['received_count'].to_i
-        else
-          json = msg_hash['json_data']
-          hash = JSON.parse(json)
-          # Start from the most complex down to the basic raw value
-          value = hash["#{param_name}__U"]
-          return value if value && type == :WITH_UNITS
-
-          value = hash["#{param_name}__F"]
-          return value if value && (type == :WITH_UNITS || type == :FORMATTED)
-
-          value = hash["#{param_name}__C"]
-          return value if value && (type == :WITH_UNITS || type == :FORMATTED || type == :CONVERTED)
-
-          return hash[param_name]
-        end
-      end
-    end
-
     ###########################################################################
     # Stream APIs
     ###########################################################################
 
-    def self.initialize_streams(topics)
-      self.instance.initialize_streams(topics)
-    end
-
     def initialize_streams(topics)
       @redis_pool.with do |redis|
         topics.each do |topic|
@@ -134,48 +100,18 @@ module Cosmos
       end
     end
 
-    def self.get_oldest_message(topic)
-      self.instance.get_oldest_message(topic)
-    end
-
     def get_oldest_message(topic)
       @redis_pool.with do |redis|
         result = redis.xrange(topic, count: 1)
-        return result[0]
-      end
-    end
-
-    def self.get_newest_message(topic)
-      self.instance.get_newest_message(topic)
-    end
-
-    def get_newest_message(topic)
-      @redis_pool.with do |redis|
-        result = redis.xrevrange(topic, count: 1)
-        return result[0]
-      end
-    end
-
-    def self.get_last_offset(topic)
-      self.instance.get_last_offset(topic)
-    end
-
-    def get_last_offset(topic)
-      @redis_pool.with do |redis|
-        result = redis.xrevrange(topic, count: 1)
-        if result and result[0] and result[0][0]
-          result[0][0]
+        if result and result.length > 0
+          return result[0]
         else
-          "0-0"
+          return nil
         end
       end
     end
 
-    def self.read_topic_last(topic)
-      self.instance.read_topic_last(topic)
-    end
-
-    def read_topic_last(topic)
+    def get_newest_message(topic)
       @redis_pool.with do |redis|
         # Default in xrevrange is range end '+', start '-' which means get all
         # elements from higher ID to lower ID and since we're limiting to 1
@@ -189,18 +125,15 @@ module Cosmos
       end
     end
 
-    # TODO: Currently unused
-    # def decrement_id(id)
-    #   time, sequence = id.split('-')
-    #   if sequence == '0'
-    #     "#{time.to_i - 1}-18446744073709551615"
-    #   else
-    #     "#{time}-#{sequence.to_i - 1}"
-    #   end
-    # end
-
-    def self.update_topic_offsets(topics)
-      self.instance.update_topic_offsets(topics)
+    def get_last_offset(topic)
+      @redis_pool.with do |redis|
+        result = redis.xrevrange(topic, count: 1)
+        if result and result[0] and result[0][0]
+          result[0][0]
+        else
+          "0-0"
+        end
+      end
     end
 
     def update_topic_offsets(topics)
@@ -221,15 +154,12 @@ module Cosmos
       return offsets
     end
 
-    def self.read_topics(topics, offsets = nil, timeout_ms = 1000, &block)
-      self.instance.read_topics(topics, offsets, timeout_ms, &block)
-    end
     unless $enterprise_cosmos
-      def read_topics(topics, offsets = nil, timeout_ms = 1000)
+      def read_topics(topics, offsets = nil, timeout_ms = 1000, count = nil)
         # Logger.debug "read_topics: #{topics}, #{offsets} pool:#{@redis_pool}"
         @redis_pool.with do |redis|
           offsets = update_topic_offsets(topics) unless offsets
-          result = redis.xread(topics, offsets, block: timeout_ms)
+          result = redis.xread(topics, offsets, block: timeout_ms, count: count)
           if result and result.length > 0
             result.each do |topic, messages|
               messages.each do |msg_id, msg_hash|
@@ -244,26 +174,6 @@ module Cosmos
       end
     end
 
-    # Add new entry to the redis stream.
-    # > https://www.rubydoc.info/github/redis/redis-rb/Redis:xadd
-    #
-    # @example Without options
-    #   COSMOS::Store().write_topic('MANGO__TOPIC', {'message' => 'something'})
-    # @example With options
-    #   COSMOS::Store().write_topic('MANGO__TOPIC', {'message' => 'something'}, id: '0-0', maxlen: 1000, approximate: false)
-    #
-    # @param topic [String] the stream / topic
-    # @param msg_hash [Hash]   one or multiple field-value pairs
-    #
-    # @option opts [String]  :id          the entry id, default value is `*`, it means auto generation
-    # @option opts [Integer] :maxlen      max length of entries
-    # @option opts [Boolean] :approximate whether to add `~` modifier of maxlen or not
-    #
-    # @return [String] the entry id
-    def self.write_topic(topic, msg_hash, id = '*', maxlen = nil, approximate = true)
-      self.instance.write_topic(topic, msg_hash, id, maxlen, approximate)
-    end
-
     # Add new entry to the redis stream.
     # > https://www.rubydoc.info/github/redis/redis-rb/Redis:xadd
     #
@@ -289,23 +199,6 @@ module Cosmos
       end
     end
 
-    # Trims older entries of the redis stream if needed.
-    # > https://www.rubydoc.info/github/redis/redis-rb/Redis:xtrim
-    #
-    # @example Without options
-    #   COSMOS::Store.trim_topic('MANGO__TOPIC', 1000)
-    # @example With options
-    #   COSMOS::Store.trim_topic('MANGO__TOPIC', 1000, approximate: true, limit: 0)
-    #
-    # @param topic  [String]  the stream key
-    # @param minid  [Integer] max length of entries to trim
-    # @param limit  [Boolean] whether to add `~` modifier of maxlen or not
-    #
-    # @return [Integer] the number of entries actually deleted
-    def self.trim_topic(topic, minid, approximate = true, limit: 0)
-      self.instance.trim_topic(topic, minid, approximate, limit: limit)
-    end
-
     # Trims older entries of the redis stream if needed.
     # > https://www.rubydoc.info/github/redis/redis-rb/Redis:xtrim
     #
@@ -324,15 +217,13 @@ module Cosmos
         return redis.xtrim_minid(topic, minid, approximate: approximate, limit: limit)
       end
     end
+  end
 
-    # Execute any Redis command. Args must be an array (e.g. ["KEYS", "*"])
-    def self.execute_raw(args)
-      self.instance.execute_raw(args)
-    end
-
-    # Execute any Redis command. Args must be an array (e.g. ["KEYS", "*"])
-    def execute_raw(args)
-      synchronize { |client| client.call(args) }
+  class EphemeralStore < Store
+    def initialize(pool_size = 10)
+      super(pool_size)
+      @redis_url = "redis://#{ENV['COSMOS_REDIS_EPHEMERAL_HOSTNAME']}:#{ENV['COSMOS_REDIS_EPHEMERAL_PORT']}"
+      @redis_pool = ConnectionPool.new(size: pool_size) { build_redis() }
     end
   end
 end

data/lib/cosmos/version.rb

@@ -1,13 +1,14 @@
 # encoding: ascii-8bit
 
-COSMOS_VERSION = '5.0.2'
+COSMOS_VERSION = '5.0.5'
 module Cosmos
   module Version
     MAJOR = '5'
     MINOR = '0'
-    PATCH = '2'
+    PATCH = '5'
     OTHER = ''
-    BUILD = 'ce01db297de2695bdb78b542c428ca244144d59a'
+    BUILD = 'e31c5f3ab7a18f52db7c00430c36efe651048fd7'
   end
-  VERSION = '5.0.2'
+  VERSION = '5.0.5'
+  GEM_VERSION = '5.0.5'
 end

data/templates/plugin-template/plugin.gemspec

@@ -20,6 +20,4 @@ spec = Gem::Specification.new do |s|
     s.version = '0.0.0' + ".#{time}"
   end
   s.files = Dir.glob("{targets,lib,procedures,tools,microservices}/**/*") + %w(Rakefile README.md plugin.txt)
-
-  s.add_runtime_dependency 'cosmos', '~> 5.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cosmos
 version: !ruby/object:Gem::Version
-  version: 5.0.2
+  version: 5.0.5
 platform: ruby
 authors:
 - Ryan Melton
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-28 00:00:00.000000000 Z
+date: 2022-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -129,14 +129,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.13'
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
@@ -157,14 +157,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: 2.2.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: 2.2.3.1
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
@@ -500,7 +500,6 @@ executables:
 - cosmos
 - rubysloc
 - cstol_converter
-- xtce_converter
 extensions:
 - ext/cosmos/ext/array/extconf.rb
 - ext/cosmos/ext/buffered_file/extconf.rb
@@ -524,7 +523,6 @@ files:
 - bin/cosmos
 - bin/cstol_converter
 - bin/rubysloc
-- bin/xtce_converter
 - data/config/_array_params.yaml
 - data/config/_id_items.yaml
 - data/config/_id_params.yaml
@@ -693,7 +691,7 @@ files:
 - lib/cosmos/models/microservice_model.rb
 - lib/cosmos/models/microservice_status_model.rb
 - lib/cosmos/models/model.rb
-- lib/cosmos/models/narrative_model.rb
+- lib/cosmos/models/note_model.rb
 - lib/cosmos/models/notification_model.rb
 - lib/cosmos/models/ping_model.rb
 - lib/cosmos/models/plugin_model.rb
@@ -703,8 +701,11 @@ files:
 - lib/cosmos/models/router_model.rb
 - lib/cosmos/models/router_status_model.rb
 - lib/cosmos/models/scope_model.rb
+- lib/cosmos/models/settings_model.rb
+- lib/cosmos/models/sorted_model.rb
 - lib/cosmos/models/target_model.rb
 - lib/cosmos/models/timeline_model.rb
+- lib/cosmos/models/tool_config_model.rb
 - lib/cosmos/models/tool_model.rb
 - lib/cosmos/models/trigger_group_model.rb
 - lib/cosmos/models/trigger_model.rb
@@ -771,6 +772,7 @@ files:
 - lib/cosmos/topics/calendar_topic.rb
 - lib/cosmos/topics/command_decom_topic.rb
 - lib/cosmos/topics/command_topic.rb
+- lib/cosmos/topics/config_topic.rb
 - lib/cosmos/topics/interface_topic.rb
 - lib/cosmos/topics/limits_event_topic.rb
 - lib/cosmos/topics/notifications_topic.rb
@@ -837,7 +839,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.5
+rubygems_version: 3.3.14
 signing_key:
 specification_version: 4
 summary: Ball Aerospace COSMOS

data/bin/xtce_converter

@@ -1,92 +0,0 @@
-#!/usr/bin/env ruby
-# encoding: ascii-8bit
-
-# Copyright 2022 Ball Aerospace & Technologies Corp.
-# All Rights Reserved.
-#
-# This program is free software; you can modify and/or redistribute it
-# under the terms of the GNU Affero General Public License
-# as published by the Free Software Foundation; version 3 with
-# attribution addendums as found in the LICENSE.txt
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# This program may also be used under the terms of a commercial or
-# enterprise edition license of COSMOS if purchased from the
-# copyright holder
-
-# This file converts to and from the .xtce file format
-
-require 'ostruct'
-require 'optparse'
-require 'cosmos'
-
-input_filename = nil
-
-option_parser = OptionParser.new do |option_parser|
-  option_parser.banner = "Usage: xtce_converter [options] --import input_xtce_filename output_dir\n       xtce_converter [options] --export output_dir"
-  option_parser.separator("")
-
-  # Create the help option
-  option_parser.on("-h", "--help", "Show this message") do
-    puts option_parser
-    exit
-  end
-
-  # Create the version option
-  option_parser.on("-v", "--version", "Show version") do
-    puts "COSMOS Version: #{COSMOS_VERSION}"
-    puts "User Version: #{USER_VERSION}" if defined? USER_VERSION
-    exit
-  end
-
-  # Create the system option
-  option_parser.on("--system VALUE", "Use an alternative system.txt file") do |arg|
-    Cosmos::System.instance(File.join(USERPATH, 'config', 'system', arg))
-  end
-
-  # Handle --import mode
-  option_parser.on("-i VALUE", "--import VALUE", "Import the specified .xtce file") do |arg|
-    input_filename = arg
-  end
-
-  # Handle --export mode
-  option_parser.on("-e", "--export", "Create .xtce file(s) from the COSMOS Configuration") do |arg|
-    # This is optional and the default
-  end
-end
-
-begin
-  option_parser.parse!(ARGV)
-rescue => err
-  puts err
-  puts option_parser
-  exit
-end
-
-if ARGV[0]
-  output_dir = ARGV[0]
-else
-  puts option_parser
-  exit
-end
-
-if input_filename
-  packet_config = Cosmos::PacketConfig.new
-  puts "Processing #{input_filename}..."
-  packet_config.process_file(input_filename, nil)
-  puts "Converting to COSMOS config files in #{output_dir}"
-  packet_config.to_config(output_dir)
-  puts "Success"
-  exit 0
-else
-  puts "Loading COSMOS Configuration..."
-  Cosmos::System.commands
-  puts "Converting configuration to .xtce files in #{output_dir}"
-  Cosmos::System.instance.instance_variable_get(:@config).to_xtce(output_dir)
-  puts "Success"
-  exit 0
-end