openc3 5.9.1 → 5.10.1

data/lib/openc3/topics/command_decom_topic.rb

@@ -24,10 +24,6 @@ require 'openc3/topics/topic'
 
 module OpenC3
   class CommandDecomTopic < Topic
-    def self.topics(scope:)
-      super(scope, 'DECOMCMD')
-    end
-
     def self.write_packet(packet, scope:)
       topic = "#{scope}__DECOMCMD__{#{packet.target_name}}__#{packet.packet_name}"
       msg_hash = { time: packet.packet_time.to_nsec_from_epoch,

data/lib/openc3/topics/telemetry_decom_topic.rb

@@ -25,10 +25,6 @@ require 'openc3/utilities/open_telemetry'
 
 module OpenC3
   class TelemetryDecomTopic < Topic
-    def self.topics(scope:)
-      super(scope, 'DECOM')
-    end
-
     def self.write_packet(packet, id: nil, scope:)
       OpenC3.in_span("write_packet") do
         # Need to build a JSON hash of the decommutated data

data/lib/openc3/topics/telemetry_reduced_topics.rb

@@ -17,7 +17,7 @@
 # All changes Copyright 2022, OpenC3, Inc.
 # All Rights Reserved
 #
-# This file may also be used under the terms of a commercial license 
+# This file may also be used under the terms of a commercial license
 # if purchased from OpenC3, Inc.
 
 require 'openc3/topics/topic'
@@ -25,10 +25,6 @@ require 'openc3/utilities/open_telemetry'
 
 module OpenC3
   class TelemetryReducedMinuteTopic < Topic
-    def self.topics(scope:)
-      super(scope, 'REDUCED_MINUTE')
-    end
-
     def self.write(target_name:, packet_name:, stored:, time:, data:, id: nil, scope:)
       OpenC3.in_span("write") do
         # Write to stream
@@ -47,10 +43,6 @@ module OpenC3
   end
 
   class TelemetryReducedHourTopic < Topic
-    def self.topics(scope:)
-      super(scope, 'REDUCED_HOUR')
-    end
-
     def self.write(target_name:, packet_name:, stored:, time:, data:, id: nil, scope:)
       OpenC3.in_span("write") do
         # Write to stream
@@ -69,10 +61,6 @@ module OpenC3
   end
 
   class TelemetryReducedDayTopic < Topic
-    def self.topics(scope:)
-      super(scope, 'REDUCED_DAY')
-    end
-
     def self.write(target_name:, packet_name:, stored:, time:, data:, id: nil, scope:)
       OpenC3.in_span("write") do
         # Write to stream

data/lib/openc3/topics/topic.rb

@@ -33,14 +33,6 @@ module OpenC3
       topics.each { |topic| EphemeralStore.xtrim(topic, maxlen) }
     end
 
-    def self.topics(scope, key)
-      EphemeralStore
-        .scan_each(match: "#{scope}__#{key}__*", type: 'stream', count: 100)
-        .to_a # Change the enumerator into an array
-        .uniq # Scan can return duplicates so ensure unique
-        .sort # Sort not entirely necessary but nice
-    end
-
     def self.get_cnt(topic)
       _, packet = EphemeralStore.get_newest_message(topic)
       packet ? packet["received_count"].to_i : 0

data/lib/openc3/utilities/authentication.rb

@@ -98,7 +98,6 @@ module OpenC3
       rescue OpenC3AuthenticationError
         return nil
       end
-      return nil
     end
 
     private

data/lib/openc3/utilities/aws_bucket.rb

@@ -42,45 +42,47 @@ module OpenC3
     end
 
     def ensure_public(bucket)
-      policy = <<~EOL
-      {
-        "Version": "2012-10-17",
-        "Statement": [
-          {
-            "Action": [
-              "s3:GetBucketLocation",
-              "s3:ListBucket"
-            ],
-            "Effect": "Allow",
-            "Principal": {
-              "AWS": [
-                "*"
-              ]
-            },
-            "Resource": [
-              "arn:aws:s3:::#{bucket}"
-            ],
-            "Sid": ""
-          },
-          {
-            "Action": [
-              "s3:GetObject"
-            ],
-            "Effect": "Allow",
-            "Principal": {
-              "AWS": [
-                "*"
-              ]
+      unless ENV['OPENC3_NO_BUCKET_POLICY']
+        policy = <<~EOL
+        {
+          "Version": "2012-10-17",
+          "Statement": [
+            {
+              "Action": [
+                "s3:GetBucketLocation",
+                "s3:ListBucket"
+              ],
+              "Effect": "Allow",
+              "Principal": {
+                "AWS": [
+                  "*"
+                ]
+              },
+              "Resource": [
+                "arn:aws:s3:::#{bucket}"
+              ],
+              "Sid": ""
             },
-            "Resource": [
-              "arn:aws:s3:::#{bucket}/*"
-            ],
-            "Sid": ""
-          }
-        ]
-      }
-      EOL
-      @client.put_bucket_policy({ bucket: bucket, policy: policy })
+            {
+              "Action": [
+                "s3:GetObject"
+              ],
+              "Effect": "Allow",
+              "Principal": {
+                "AWS": [
+                  "*"
+                ]
+              },
+              "Resource": [
+                "arn:aws:s3:::#{bucket}/*"
+              ],
+              "Sid": ""
+            }
+          ]
+        }
+        EOL
+        @client.put_bucket_policy({ bucket: bucket, policy: policy })
+      end
     end
 
     def exist?(bucket)
@@ -213,10 +215,14 @@ module OpenC3
 
     def delete_object(bucket:, key:)
       @client.delete_object(bucket: bucket, key: key)
+    rescue Exception
+      Logger.error("Error deleting object bucket: #{bucket}, key: #{key}")
     end
 
     def delete_objects(bucket:, keys:)
       @client.delete_objects(bucket: bucket, delete: { objects: keys.map {|key| { key: key } } })
+    rescue Exception
+      Logger.error("Error deleting objects bucket: #{bucket}, keys: #{keys}")
     end
 
     def presigned_request(bucket:, key:, method:, internal: true)

data/lib/openc3/utilities/store_autoload.rb

@@ -196,12 +196,12 @@ module OpenC3
     #   store.trim_topic('MANGO__TOPIC', 1000, approximate: 'true', limit: 0)
     #
     # @param topic  [String]  the stream key
-    # @param minid  [Integer] mid id length of entries to trim
+    # @param minid  [Integer] Id to throw away data up to
     # @param approximate [Boolean] whether to add `~` modifier of maxlen or not
-    # @param limit  [Boolean] whether to add `~` modifier of maxlen or not
+    # @param limit  [Boolean] number of items to return from the call
     #
     # @return [Integer] the number of entries actually deleted
-    def trim_topic(topic, minid, approximate = 'true', limit: 0)
+    def trim_topic(topic, minid, approximate = true, limit: 0)
       @redis_pool.with do |redis|
         return redis.xtrim_minid(topic, minid, approximate: approximate, limit: limit)
       end
@@ -218,8 +218,8 @@ module OpenC3
 end
 
 class Redis
-  def xtrim_minid(key, minid, approximate: 'true', limit: nil)
-    args = [:xtrim, key, :MINID, (approximate ? '~' : nil), minid].compact
+  def xtrim_minid(key, minid, approximate: true, limit: nil)
+    args = [:xtrim, key, :MINID, (approximate ? '~' : '='), minid]
     args.concat([:LIMIT, limit]) if limit
     send_command(args)
   end

data/lib/openc3/version.rb

@@ -1,14 +1,14 @@
 # encoding: ascii-8bit
 
-OPENC3_VERSION = '5.9.1'
+OPENC3_VERSION = '5.10.1'
 module OpenC3
   module Version
     MAJOR = '5'
-    MINOR = '9'
+    MINOR = '10'
     PATCH = '1'
     OTHER = ''
-    BUILD = 'e60c6e1f7e80f87eae7bc623986940da5449d6ad'
+    BUILD = 'b248056bc6fa7af79757e21f3b79601118eec0e5'
   end
-  VERSION = '5.9.1'
-  GEM_VERSION = '5.9.1'
+  VERSION = '5.10.1'
+  GEM_VERSION = '5.10.1'
 end

data/templates/tool_angular/package.json

@@ -1,6 +1,6 @@
 {
   "name": "<%= tool_name %>",
-  "version": "5.9.1",
+  "version": "5.10.1",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",
@@ -12,30 +12,30 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^16.1.3",
-    "@angular/cdk": "^16.1.3",
-    "@angular/common": "^16.1.3",
-    "@angular/compiler": "^16.1.3",
-    "@angular/core": "^16.1.3",
-    "@angular/forms": "^16.1.3",
-    "@angular/material": "16.1.3",
-    "@angular/platform-browser": "^16.1.3",
-    "@angular/platform-browser-dynamic": "^16.1.3",
-    "@angular/router": "^16.1.3",
-    "@openc3/tool-common": "5.9.1",
+    "@openc3/tool-common": "5.10.1",
+    "@angular/animations": "^16.2.0",
+    "@angular/cdk": "^16.2.0",
+    "@angular/common": "^16.2.0",
+    "@angular/compiler": "^16.2.0",
+    "@angular/core": "^16.2.0",
+    "@angular/forms": "^16.2.0",
+    "@angular/material": "16.2.0",
+    "@angular/platform-browser": "^16.2.0",
+    "@angular/platform-browser-dynamic": "^16.2.0",
+    "@angular/router": "^16.2.0",
     "rxjs": "~7.8.0",
     "single-spa": ">=5.9.5",
     "single-spa-angular": "^8.1.0",
-    "tslib": "^2.6.0",
+    "tslib": "^2.6.1",
     "zone.js": "~0.13.1"
   },
   "devDependencies": {
     "@angular-builders/custom-webpack": "16.0.0",
-    "@angular-devkit/build-angular": "^16.0.5",
-    "@angular/cli": "~16.1.3",
-    "@angular/compiler-cli": "^16.0.0",
+    "@angular-devkit/build-angular": "^16.2.0",
+    "@angular/cli": "~16.2.0",
+    "@angular/compiler-cli": "^16.2.0",
     "@types/jasmine": "~4.3.0",
-    "jasmine-core": "~5.0.1",
+    "jasmine-core": "~5.1.0",
     "karma": "~6.4.0",
     "karma-chrome-launcher": "~3.2.0",
     "karma-coverage": "~2.2.0",