openc3 5.10.0 → 5.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c37c79f2062a5921e13c3370ce281c443b9abba929ca36f152df7cd1bcea92e
-  data.tar.gz: 643d74e05f61eb9016eaefbe5dca61316939e3d4e063fcf4150423cee4d95474
+  metadata.gz: e462e9d0a5d73e46212ec61b784b432827b0588b64308449309196e1257ad5b0
+  data.tar.gz: 4811700be9aeab28edc867d11e26481d7cbf63abe8bb3ca9ef956823d8adb17d
 SHA512:
-  metadata.gz: 25285376d600c16a3d0b6d485a359998fda7226fc3781f639cdde992370291fa7d23b0ce6ca89e02ddcf4e6386dd596839ed4d8c704003b893e37e726ed1a7e4
-  data.tar.gz: 3ae81b7ea67047a8e23cfb161aeb77b4e7224e44b2c9c1dc4fa2dd78cb06eae50710b0a5c882cfcaf8da9e0214b6b96e517ec2a6af0b7671f5b8e8a0dc1448fe
+  metadata.gz: 0e01b50dc62e075afe78f66101e176ec20118f017122a8f76a1eb3d1b302250e55717897c2302c6bf812cece5bedf0d9e6a0b1fdc2dc43f68998a693d7b04b4d
+  data.tar.gz: 5a93a1b914e84e5555cc88e4c74da80a8283ae621c958c6d9535848c1ff384dd7aa3a6ba59dff7e148b91eb3370ef563ec0a8c94f1ecafc517bd65665f8f8e2a

data/Gemfile

@@ -14,4 +14,4 @@ gem 'tzinfo-data'
 gem 'rspec-rails', '~> 6.0'
 gem 'simplecov', '~> 0.20'
 gem 'simplecov-cobertura', '~> 2.1'
-gem 'mock_redis'
+gem 'mock_redis', '0.36'

data/lib/openc3/microservices/trigger_group_microservice.rb

@@ -355,9 +355,13 @@ module OpenC3
       end
       # This shouldn't happen because the frontend provides valid items but good to check
       # The raise is ultimately rescued inside evaluate_trigger when operand_value is called
-      raise "Packet #{operand[ITEM_TARGET]} #{operand[ITEM_PACKET]} not found" if packet.nil?
+      if packet.nil?
+        raise "Packet #{operand[ITEM_TARGET]} #{operand[ITEM_PACKET]} not found"
+      end
       value = packet.read(operand[ITEM_TYPE], operand[ITEM_VALUE_TYPE].intern)
-      raise "Item #{operand[ITEM_TARGET]} #{operand[ITEM_PACKET]} #{operand[ITEM_TYPE]} not found" if value.nil?
+      if value.nil?
+        raise "Item #{operand[ITEM_TARGET]} #{operand[ITEM_PACKET]} #{operand[ITEM_TYPE]} not found"
+      end
       value
     end
 

data/lib/openc3/packets/packet.rb

@@ -540,7 +540,7 @@ module OpenC3
 
     # (see Structure#get_item)
     def get_item(name)
-      super(name)
+      return super(name)
     rescue ArgumentError
       raise "Packet item '#{@target_name} #{@packet_name} #{name.upcase}' does not exist"
     end
@@ -1056,10 +1056,10 @@ module OpenC3
 
       if @processors
         processors = []
-        config['processors'] = processors
         @processors.each do |processor_name, processor|
           processors << processor.as_json(*a)
         end
+        config['processors'] = processors
       end
 
       config['meta'] = @meta if @meta
@@ -1144,17 +1144,11 @@ module OpenC3
         # Update to new limits state
         item.limits.state = limits_state
 
-        if old_limits_state == nil # Changing from nil
-          if limits_state != :GREEN && limits_state != :BLUE # Warnings are needed
-            @limits_change_callback.call(self, item, old_limits_state, value, true) if @limits_change_callback
-          end
-        else # Changing from a state other than nil so always call the callback
-          if @limits_change_callback
-            if item.limits.state.nil?
-              @limits_change_callback.call(self, item, old_limits_state, value, false)
-            else
-              @limits_change_callback.call(self, item, old_limits_state, value, true)
-            end
+        if @limits_change_callback
+          if item.limits.state.nil?
+            @limits_change_callback.call(self, item, old_limits_state, value, false)
+          else
+            @limits_change_callback.call(self, item, old_limits_state, value, true)
           end
         end
       end

data/lib/openc3/packets/structure_item.rb

@@ -76,9 +76,6 @@ module OpenC3
     # @return [Boolean] Whether this structure item can overlap another item in the same packet
     attr_accessor :overlap
 
-    # A large buffer size in bits (1 Megabyte)
-    LARGE_BUFFER_SIZE_BITS = 1024 * 1024 * 8
-
     # Create a StructureItem by setting all the attributes. It
     # calls all the setter routines to do the attribute verification and then
     # verifies the overall integrity.

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/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)

data/lib/openc3/version.rb

@@ -1,14 +1,14 @@
 # encoding: ascii-8bit
 
-OPENC3_VERSION = '5.10.0'
+OPENC3_VERSION = '5.10.1'
 module OpenC3
   module Version
     MAJOR = '5'
     MINOR = '10'
-    PATCH = '0'
+    PATCH = '1'
     OTHER = ''
-    BUILD = '926e6a3798993710a67729b9599c5a295b210152'
+    BUILD = 'b248056bc6fa7af79757e21f3b79601118eec0e5'
   end
-  VERSION = '5.10.0'
-  GEM_VERSION = '5.10.0'
+  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.10.0",
+  "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.10.0",
+    "@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",