openc3 5.15.1 → 5.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e965c2b2463c93d4f1831b6d6cdfc53cae47bac8297e4335be407e420b37545e
-  data.tar.gz: 1f4a4d4f367daf99411d70d693f511a6550f911787d46f0602e6bc440edc19c5
+  metadata.gz: a39dab08bb9810376520e75a7bf3a6c63d30ad54b93566b82a849d780693a366
+  data.tar.gz: 65d282829dba0706cbe0e32603e51ad8ab3dfc0fdaf37d9bd400787bb7a1cb03
 SHA512:
-  metadata.gz: 37956addc6a7019369e710ea02fcf8c71b114b049e83eeef7b7a0c2e99f17c2f685311db55697cb31a518bea8cc815647d370d0bdb9640259d76df86b79dff9a
-  data.tar.gz: f90a6beae03680d8fdc256ea2bf4dc937667a4a9d29bc6d3daccd33de02ea485ce808a52ed73a1ce251e0a9a7dc9ef3e9ccf1acdbe5ab8fa360f2dfbfbb104d8
+  metadata.gz: 12bffefe104e90e159c16bcc54ab53745e86a97bfb762c7e0e25141d6bd3c91ad6bb8827017d915dfb459b2fc69ea7365c97e7fa22236abb16ff0d73d8d485d7
+  data.tar.gz: b2efa2780f97e2aa3392cc483534d949be4fb27032dbc3e52015ebfa89da08d234e5777c50dbfa09e477357d3b5ca67aba847f8f5d723676d2331da84e880f7f

data/data/config/widgets.yaml

@@ -1302,7 +1302,7 @@ Interactive Widgets:
 
         Button code can get rather complex so remember to use string concatenation
         to make things more readable. If you use `+` newlines are inserted automatically
-        during string concatenation. If you use `\` you'll need to separate lines with a
+        during string concatenation. If you use `\\` you'll need to separate lines with a
         single semicolon `;`. COSMOS uses double semicolon `;;` to indicate lines should
         be evaluated separately. Note that all OpenC3 commands (using api.cmd) must be
         separated by `;;`.

data/lib/openc3/accessors/json_accessor.rb

@@ -18,8 +18,16 @@
 
 require 'json'
 require 'jsonpath'
+require 'openc3/io/json_rpc'
 require 'openc3/accessors/accessor'
 
+# Monkey patch JsonPath to enable create_additions and allow_nan to support binary strings, and NaN, Infinity, -Infinity
+class JsonPath
+  def self.process_object(obj_or_str, opts = {})
+    obj_or_str.is_a?(String) ? MultiJson.decode(obj_or_str, max_nesting: opts[:max_nesting], create_additions: true, allow_nan: true) : obj_or_str
+  end
+end
+
 module OpenC3
   class JsonAccessor < Accessor
     def self.read_item(item, buffer)
@@ -33,7 +41,7 @@ module OpenC3
 
       # Convert to ruby objects
       if String === buffer
-        decoded = JSON.parse(buffer, :allow_nan => true)
+        decoded = JSON.parse(buffer, :allow_nan => true, :create_additions => true)
       else
         decoded = buffer
       end
@@ -43,7 +51,7 @@ module OpenC3
 
       # Update buffer
       if String === buffer
-        buffer.replace(JSON.generate(decoded, :allow_nan => true))
+        buffer.replace(JSON.generate(decoded.as_json, :allow_nan => true))
       end
 
       return value
@@ -52,7 +60,7 @@ module OpenC3
     def self.read_items(items, buffer)
       # Prevent JsonPath from decoding every call
       if String === buffer
-        decoded = JSON.parse(buffer, :allow_nan => true)
+        decoded = JSON.parse(buffer, :allow_nan => true, :create_additions => true)
       else
         decoded = buffer
       end

data/lib/openc3/io/posix_serial_driver.rb

@@ -14,10 +14,10 @@
 # GNU Affero General Public License for more details.
 
 # Modified by OpenC3, Inc.
-# All changes Copyright 2022, OpenC3, Inc.
+# All changes Copyright 2024, 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 'fcntl'
@@ -82,12 +82,17 @@ module OpenC3
       tio.ospeed = baud_rate
       @handle.tcflush(Termios::TCIOFLUSH)
       @handle.tcsetattr(Termios::TCSANOW, tio)
+
+      @pipe_reader, @pipe_writer = IO.pipe
+      @readers = [@handle, @pipe_reader]
     end
 
     # (see SerialDriver#close)
     def close
       if @handle
         # Close the serial Port
+        @pipe_writer.write('.')
+        @pipe_writer.close
         @handle.close
         @handle = nil
       end
@@ -132,9 +137,19 @@ module OpenC3
       begin
         data = @handle.read_nonblock(65535)
       rescue Errno::EAGAIN, Errno::EWOULDBLOCK
-        result = IO.fast_select([@handle], nil, nil, @read_timeout)
-        if result
-          retry
+        begin
+          read_ready, _ = IO.fast_select(@readers, nil, nil, @read_timeout)
+        rescue IOError
+          @pipe_reader.close unless @pipe_reader.closed?
+          return ""
+        end
+        if read_ready
+          if read_ready.include?(@pipe_reader)
+            @pipe_reader.close unless @pipe_reader.closed?
+            return ""
+          else
+            retry
+          end
         else
           raise Timeout::Error, "Read Timeout"
         end

data/lib/openc3/script/storage.rb

@@ -14,7 +14,7 @@
 # GNU Affero General Public License for more details.
 
 # Modified by OpenC3, Inc.
-# All changes Copyright 2022, OpenC3, Inc.
+# All changes Copyright 2024, OpenC3, Inc.
 # All Rights Reserved
 #
 # This file may also be used under the terms of a commercial license
@@ -175,9 +175,8 @@ module OpenC3
       if $openc3_in_cluster
         case ENV['OPENC3_CLOUD']
         when 'local'
-          bucket_url = ENV["OPENC3_BUCKET_URL"] || "openc3-minio:9000"
-          # TODO: Bucket schema for http vs https
-          URI.parse("http://#{bucket_url}#{url}")
+          bucket_url = ENV["OPENC3_BUCKET_URL"] || "http://openc3-minio:9000"
+          URI.parse("#{bucket_url}#{url}")
         when 'aws'
           URI.parse("https://s3.#{ENV['AWS_REGION']}.amazonaws.com" + url)
         when 'gcp'

data/lib/openc3/script/web_socket_api.rb

@@ -215,6 +215,16 @@ module OpenC3
     end
   end
 
+  # All Scripts WebSocket
+  class AllScriptsWebSocketApi < ScriptWebSocketApi
+    def initialize(url: nil, write_timeout: 10.0, read_timeout: 10.0, connect_timeout: 5.0, authentication: nil, scope: $openc3_scope)
+      @identifier = {
+        channel: "AllScriptsChannel",
+      }
+      super(url: url, write_timeout: write_timeout, read_timeout: read_timeout, connect_timeout: connect_timeout, authentication: authentication, scope: scope)
+    end
+  end
+
   # Log Messages WebSocket
   class MessagesWebSocketApi < CmdTlmWebSocketApi
     def initialize(history_count: 0, start_time: nil, end_time: nil, level: nil, types: nil, url: nil, write_timeout: 10.0, read_timeout: 10.0, connect_timeout: 5.0, authentication: nil, scope: $openc3_scope)

data/lib/openc3/version.rb

@@ -1,14 +1,14 @@
 # encoding: ascii-8bit
 
-OPENC3_VERSION = '5.15.1'
+OPENC3_VERSION = '5.15.2'
 module OpenC3
   module Version
     MAJOR = '5'
     MINOR = '15'
-    PATCH = '1'
+    PATCH = '2'
     OTHER = ''
-    BUILD = 'e825c03f698ac51170218e43cec3c3cecefe58fa'
+    BUILD = '460e13eadf313640ad089597bee233ecdafd2ffa'
   end
-  VERSION = '5.15.1'
-  GEM_VERSION = '5.15.1'
+  VERSION = '5.15.2'
+  GEM_VERSION = '5.15.2'
 end

data/templates/target/targets/TARGET/lib/target.py

@@ -4,6 +4,8 @@
 #   <%= target_object %>.utility()
 # For more information see the OpenC3 scripting guide
 
+from openc3.script import *
+
 class <%= target_class %>:
     def utility(self):
         pass

data/templates/tool_angular/package.json

@@ -1,6 +1,6 @@
 {
   "name": "<%= tool_name %>",
-  "version": "5.15.1",
+  "version": "5.15.2",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",
@@ -12,7 +12,7 @@
   },
   "private": true,
   "dependencies": {
-    "@openc3/tool-common": "5.15.1",
+    "@openc3/tool-common": "5.15.2",
     "@angular/animations": "^17.0.8",
     "@angular/cdk": "^17.0.4",
     "@angular/common": "^17.0.8",

data/templates/tool_svelte/package.json

@@ -11,7 +11,7 @@
     "smui-theme": "smui-theme compile build/smui.css -i src/theme"
   },
   "dependencies": {
-    "@openc3/tool-common": "5.15.1",
+    "@openc3/tool-common": "5.15.2",
     "@astrouxds/astro-web-components": "7.20.0",
     "@smui/button": "^7.0.0-beta.16",
     "@smui/card": "^7.0.0-beta.16",

data/templates/tool_vue/package.json

@@ -1,6 +1,6 @@
 {
   "name": "<%= tool_name %>",
-  "version": "5.15.1",
+  "version": "5.15.2",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -11,7 +11,7 @@
     "test:components": "vue-cli-service test:components"
   },
   "dependencies": {
-    "@openc3/tool-common": "5.15.1",
+    "@openc3/tool-common": "5.15.2",
     "@astrouxds/astro-web-components": "7.20.0",
     "axios": "1.6.5",
     "date-fns": "2.30.0",

data/templates/widget/package.json

@@ -1,12 +1,12 @@
 {
   "name": "widget",
-  "version": "5.15.1",
+  "version": "5.15.2",
   "private": true,
   "scripts": {
     "build": "vue-cli-service build --target lib --dest tools/widgets/<%= widget_name %> --formats umd-min <%= widget_path %> --name <%= widget_name %>"
   },
   "dependencies": {
-    "@openc3/tool-common": "5.15.1",
+    "@openc3/tool-common": "5.15.2",
     "@astrouxds/astro-web-components": "7.20.0",
     "vue": "2.7.16",
     "vuetify": "2.7.1"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openc3
 version: !ruby/object:Gem::Version
-  version: 5.15.1
+  version: 5.15.2
 platform: ruby
 authors:
 - Ryan Melton
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-15 00:00:00.000000000 Z
+date: 2024-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler