openc3 6.10.5 → 6.10.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1439206d21d96fe96217e987cf7fe76c61810fbad73bde8dd26a3206154f3b2f
-  data.tar.gz: 114eff9211c6c9eb997f14e67b6e4c278a0a73781ef4c5097248b693049fa3dd
+  metadata.gz: 82d3b0dd7139864979565d068d7ef9bb74839e8c120c361ef010e6ed2f85c39d
+  data.tar.gz: c90d9fb70c93f8e5409c85272012e014a1dd28850ca9d747960a84b18a22ee72
 SHA512:
-  metadata.gz: 4f1fa618d7da541bb161d2f545810399be14877b42caa1f9f0d12c6d257c903de578dc032816eeb31fa8b000e04f116e471660097adfbd7cf69d82fd6a4bf892
-  data.tar.gz: c1af9b3d8c5403d83388036ac591ece57b8c677a7d038b1f63e1bf8e5f0560958200ac5e15a4eacc53c4578e6c154a195454aa9c633e66531544e926d8496c5b
+  metadata.gz: 675f0387d53e5530b6a2895173d14cc4ebb6d5e6c991ac94d4efcde3acfa11c1ba55c473f2d586f2a1fa4e285e1eb060c6bd9c292b0d7726b506689117ea1159
+  data.tar.gz: 9265cd85dc41188c5e4c1610e1d340c5b4e6a7a65e798a717dea4ec8f6e0e70de258d3aad76af36bb88b292646aed63ab449ab5a4321e124e57809a26a255ed6

data/lib/openc3/accessors/json_accessor.rb

@@ -1,6 +1,6 @@
 # encoding: ascii-8bit
 
-# Copyright 2023 OpenC3, Inc.
+# Copyright 2026 OpenC3, Inc.
 # All Rights Reserved.
 #
 # This program is free software; you can modify and/or redistribute it
@@ -25,7 +25,7 @@ require 'openc3/accessors/accessor'
 OpenC3.disable_warnings do
   class JsonPath
     def self.process_object(obj_or_str, opts = {})
-      obj_or_str.is_a?(String) ? MultiJson.load(obj_or_str, max_nesting: opts[:max_nesting], create_additions: true, allow_nan: true) : obj_or_str
+      obj_or_str.is_a?(String) ? JSON.parse(obj_or_str, max_nesting: opts[:max_nesting], create_additions: true, allow_nan: true) : obj_or_str
     end
   end
 end

data/lib/openc3/models/activity_model.rb

@@ -14,7 +14,7 @@
 # GNU Affero General Public License for more details.
 
 # Modified by OpenC3, Inc.
-# All changes Copyright 2024, OpenC3, Inc.
+# All changes Copyright 2026, OpenC3, Inc.
 # All Rights Reserved
 #
 # This file may also be used under the terms of a commercial license
@@ -33,6 +33,11 @@ module OpenC3
 
   class ActivityModel < Model
     MAX_DURATION = Time::SEC_PER_DAY
+    # Grace window (in seconds) to allow creating activities slightly in the past.
+    # This handles race conditions where real-time activity notifications arrive
+    # after the start time has already passed (e.g. from external systems).
+    # This is consistent with the -15 second window in the timeline microservice.
+    START_GRACE_SECONDS = 15
     PRIMARY_KEY = '__openc3_timelines'.freeze # MUST be equal to `TimelineModel::PRIMARY_KEY` minus the leading __
     # See run_activity(activity) in openc3/lib/openc3/microservices/timeline_microservice.rb
     VALID_KINDS = %w(command script reserve expire)
@@ -217,7 +222,7 @@ module OpenC3
     end
 
     # validate the input to the rules we have created for timelines.
-    # - A task's start MUST NOT be in the past.
+    # - A task's start MUST NOT be more than START_GRACE_SECONDS in the past.
     # - A task's start MUST be before the stop.
     # - A task CAN NOT be longer than MAX_DURATION (86400) in seconds.
     # - A task MUST have a kind.
@@ -235,8 +240,8 @@ module OpenC3
       rescue NoMethodError
         raise ActivityInputError.new "start and stop must be seconds: #{start}, #{stop}"
       end
-      if now_f >= start and kind != 'expire'
-        raise ActivityInputError.new "activity must be in the future, current_time: #{now_f} vs #{start}"
+      if now_f >= start + START_GRACE_SECONDS and kind != 'expire'
+        raise ActivityInputError.new "activity must not be more than #{START_GRACE_SECONDS} seconds in the past, current_time: #{now_f} vs #{start}"
       elsif duration > MAX_DURATION and kind != 'expire'
         raise ActivityInputError.new "activity can not be longer than #{MAX_DURATION} seconds"
       elsif duration <= 0

data/lib/openc3/models/cvt_model.rb

@@ -14,7 +14,7 @@
 # GNU Affero General Public License for more details.
 
 # Modified by OpenC3, Inc.
-# All changes Copyright 2025, OpenC3, Inc.
+# All changes Copyright 2026, OpenC3, Inc.
 # All Rights Reserved
 #
 # This file may also be used under the terms of a commercial license
@@ -166,10 +166,14 @@ module OpenC3
           query += "ASOF JOIN #{table_name} as T#{index} "
         end
       end
+      query_params = []
       if start_time && !end_time
-        query += "WHERE T0.timestamp < '#{start_time}' LIMIT -1"
+        query += "WHERE T0.PACKET_TIMESECONDS < $1 LIMIT -1"
+        query_params << start_time
       elsif start_time && end_time
-        query += "WHERE T0.timestamp >= '#{start_time}' AND T0.timestamp < '#{end_time}'"
+        query += "WHERE T0.PACKET_TIMESECONDS >= $1 AND T0.PACKET_TIMESECONDS < $2"
+        query_params << start_time
+        query_params << end_time
       end
 
       retry_count = 0
@@ -187,7 +191,7 @@ module OpenC3
             @@conn.type_map_for_results = PG::BasicTypeMapForResults.new @@conn
           end
 
-          result = @@conn.exec(query)
+          result = @@conn.exec_params(query, query_params)
           if result.nil? or result.ntuples == 0
             return {}
           else

data/lib/openc3/version.rb

@@ -1,14 +1,14 @@
 # encoding: ascii-8bit
 
-OPENC3_VERSION = '6.10.5'
+OPENC3_VERSION = '6.10.6'
 module OpenC3
   module Version
     MAJOR = '6'
     MINOR = '10'
-    PATCH = '5'
+    PATCH = '6'
     OTHER = ''
-    BUILD = '8d61f63fc7011fc77e974d0f5031950740d20ebb'
+    BUILD = '097195648aacf31991bfca633879a013c6f3af26'
   end
-  VERSION = '6.10.5'
-  GEM_VERSION = '6.10.5'
+  VERSION = '6.10.6'
+  GEM_VERSION = '6.10.6'
 end

data/templates/tool_angular/package.json

@@ -1,6 +1,6 @@
 {
   "name": "<%= tool_name %>",
-  "version": "6.10.5",
+  "version": "6.10.6",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",
@@ -23,7 +23,7 @@
     "@angular/platform-browser-dynamic": "^18.2.6",
     "@angular/router": "^18.2.6",
     "@astrouxds/astro-web-components": "^7.24.0",
-    "@openc3/js-common": "6.10.5",
+    "@openc3/js-common": "6.10.6",
     "rxjs": "~7.8.0",
     "single-spa": "^5.9.5",
     "single-spa-angular": "^9.2.0",

data/templates/tool_react/package.json

@@ -16,7 +16,7 @@
     "@emotion/react": "^11.13.3",
     "@emotion/styled": "^11.11.0",
     "@mui/material": "^6.1.1",
-    "@openc3/js-common": "6.10.5",
+    "@openc3/js-common": "6.10.6",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "single-spa-react": "^5.1.4"

data/templates/tool_svelte/package.json

@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrouxds/astro-web-components": "^7.24.0",
-    "@openc3/js-common": "6.10.5",
+    "@openc3/js-common": "6.10.6",
     "@smui/button": "^7.0.0",
     "@smui/common": "^7.0.0",
     "@smui/card": "^7.0.0",

data/templates/tool_vue/package.json

@@ -1,6 +1,6 @@
 {
   "name": "<%= tool_name %>",
-  "version": "6.10.5",
+  "version": "6.10.6",
   "private": true,
   "type": "module",
   "scripts": {
@@ -11,8 +11,8 @@
   },
   "dependencies": {
     "@astrouxds/astro-web-components": "^7.24.0",
-    "@openc3/js-common": "6.10.5",
-    "@openc3/vue-common": "6.10.5",
+    "@openc3/js-common": "6.10.6",
+    "@openc3/vue-common": "6.10.6",
     "axios": "^1.7.7",
     "date-fns": "^4.1.0",
     "lodash": "^4.17.21",

data/templates/widget/package.json

@@ -1,6 +1,6 @@
 {
   "name": "<%= widget_name %>",
-  "version": "6.10.5",
+  "version": "6.10.6",
   "private": true,
   "type": "module",
   "scripts": {
@@ -8,7 +8,7 @@
   },
   "dependencies": {
     "@astrouxds/astro-web-components": "^7.24.0",
-    "@openc3/vue-common": "6.10.5",
+    "@openc3/vue-common": "6.10.6",
     "vuetify": "^3.7.1"
   },
   "devDependencies": {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openc3
 version: !ruby/object:Gem::Version
-  version: 6.10.5
+  version: 6.10.6
 platform: ruby
 authors:
 - Ryan Melton