openc3 6.9.0 → 6.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e31ed59341fe02adf738c1773ca991bf2045fdccc994c4fa9e496aa22930e3d0
-  data.tar.gz: 9822897cdff34db69b3975cfce8b256a84410b579df7944c485097c767990344
+  metadata.gz: 83838350c2ec54b5fcd1b6108f42fe9d7f45fd24f6de04fb7c5c98855251b9b9
+  data.tar.gz: c1b89314a5af6f7740857228d01c0ab9e2b2e03e59c209b0e646fefb4f281425
 SHA512:
-  metadata.gz: b3597ed6dc60b66d41138a196bb26c95abe6d54527754e477f741e32e9529607de2f51d59491f58798b3eff2fa7dde717a94f11825eaeef2db629be9214e3f9a
-  data.tar.gz: ba3bb00eeeb33b57534ce80c78d1c1d78ccc789dcd14525699b9797b0b58dfa77e873cda843dc06101be77e78cf89aa80cccd83730a4069ed966d8ed247519eb
+  metadata.gz: 35be666ae0ea4d134fa6c7d54d79ee323e5d878918c25706d17514b1db8b28b6ca05c6c0f175426f285227e6fd16d6b90ccbf21316c71057aaaf958660a7c8a7
+  data.tar.gz: 3c0f703c797d6fbd1be90d526a91ac94a06ec6d9ad042e3ea1212da4c73557be6e4634be73ca49f17c8277f7b7052154e0283b0a994f84f91cf96422811155ac

data/lib/openc3/microservices/queue_microservice.rb

@@ -19,7 +19,7 @@
 require 'openc3/microservices/microservice'
 require 'openc3/topics/queue_topic'
 require 'openc3/utilities/authentication'
-require 'openc3/script'
+require 'openc3/api/api'
 
 module OpenC3
   module Script
@@ -32,6 +32,8 @@ module OpenC3
 
   # The queue processor runs in a single thread and processes commands via cmd_api.
   class QueueProcessor
+    include Api # Provides access to api methods
+
     attr_accessor :state
     attr_reader :name, :scope
 
@@ -43,23 +45,6 @@ module OpenC3
       @cancel_thread = false
     end
 
-    def get_token(username)
-      if ENV['OPENC3_API_CLIENT'].nil?
-        ENV['OPENC3_API_PASSWORD'] ||= ENV['OPENC3_SERVICE_PASSWORD']
-        return OpenC3Authentication.new().token
-      else
-        # Check for offline access token
-        model = nil
-        model = OpenC3::OfflineAccessModel.get_model(name: username, scope: @scope) if username and username != ''
-        if model and model.offline_access_token
-          auth = OpenC3KeycloakAuthentication.new(ENV['OPENC3_KEYCLOAK_URL'])
-          return auth.get_token_from_refresh_token(model.offline_access_token)
-        else
-          return nil
-        end
-      end
-    end
-
     def run
       while true
         if @state == 'RELEASE'
@@ -77,13 +62,11 @@ module OpenC3
           _queue_name, command_data, _timestamp = Store.bzpopmin("#{@scope}:#{@name}", timeout: 0.2)
           if command_data
             command = JSON.parse(command_data)
-            username = command['username']
-            token = get_token(username)
             # It's important to set queue: false here to avoid infinite recursion when
             # OPENC3_DEFAULT_QUEUE is set because commands would be re-queued to the default queue
             # NOTE: cmd() via script rescues hazardous errors and calls prompt_for_hazardous()
             # but we've overridden it to always return true and go straight to cmd_no_hazardous_check()
-            cmd(command['value'], queue: false, scope: @scope, token: token)
+            cmd(command['value'], queue: false, scope: @scope)
           end
         rescue StandardError => e
           @logger.error "QueueProcessor failed to process command from queue #{@name}\n#{e.message}"

data/lib/openc3/models/microservice_model.rb

@@ -157,7 +157,7 @@ module OpenC3
         'updated_at' => @updated_at,
         'plugin' => @plugin,
         'needs_dependencies' => @needs_dependencies,
-        'secrets' => @secrets.as_json(*a),
+        'secrets' => @secrets,
         'prefix' => @prefix,
         'disable_erb' => @disable_erb,
         'ignore_changes' => @ignore_changes,

data/lib/openc3/models/queue_model.rb

@@ -51,11 +51,11 @@ module OpenC3
       if model.state != 'DISABLE'
         result = Store.zrevrange("#{scope}:#{name}", 0, 0, with_scores: true)
         if result.empty?
-          index = 1.0
+          id = 1.0
         else
-          index = result[0][1].to_f + 1
+          id = result[0][1].to_f + 1
         end
-        Store.zadd("#{scope}:#{name}", index, { username: username, value: command, timestamp: Time.now.to_nsec_from_epoch }.to_json)
+        Store.zadd("#{scope}:#{name}", id, { username: username, value: command, timestamp: Time.now.to_nsec_from_epoch }.to_json)
         model.notify(kind: 'command')
       else
         raise QueueError, "Queue '#{name}' is disabled. Command '#{command}' not queued."
@@ -103,55 +103,55 @@ module OpenC3
       QueueTopic.write_notification(notification, scope: @scope)
     end
 
-    def insert_command(index, command_data)
+    def insert_command(id, command_data)
       if @state == 'DISABLE'
         raise QueueError, "Queue '#{@name}' is disabled. Command '#{command_data['value']}' not queued."
       end
 
-      unless index
+      unless id
         result = Store.zrevrange("#{@scope}:#{@name}", 0, 0, with_scores: true)
         if result.empty?
-          index = 1.0
+          id = 1.0
         else
-          index = result[0][1].to_f + 1
+          id = result[0][1].to_f + 1
         end
       end
-      Store.zadd("#{@scope}:#{@name}", index, command_data.to_json)
+      Store.zadd("#{@scope}:#{@name}", id, command_data.to_json)
       notify(kind: 'command')
     end
 
-    def update_command(index:, command:, username:)
+    def update_command(id:, command:, username:)
       if @state == 'DISABLE'
-        raise QueueError, "Queue '#{@name}' is disabled. Command at index #{index} not updated."
+        raise QueueError, "Queue '#{@name}' is disabled. Command at id #{id} not updated."
       end
 
-      # Check if command exists at the given index
-      existing = Store.zrangebyscore("#{@scope}:#{@name}", index, index)
+      # Check if command exists at the given id
+      existing = Store.zrangebyscore("#{@scope}:#{@name}", id, id)
       if existing.empty?
-        raise QueueError, "No command found at index #{index} in queue '#{@name}'"
+        raise QueueError, "No command found at id #{id} in queue '#{@name}'"
       end
 
-      # Remove the existing command and add the new one at the same index
-      Store.zremrangebyscore("#{@scope}:#{@name}", index, index)
+      # Remove the existing command and add the new one at the same id
+      Store.zremrangebyscore("#{@scope}:#{@name}", id, id)
       command_data = { username: username, value: command, timestamp: Time.now.to_nsec_from_epoch }
-      Store.zadd("#{@scope}:#{@name}", index, command_data.to_json)
+      Store.zadd("#{@scope}:#{@name}", id, command_data.to_json)
       notify(kind: 'command')
     end
 
-    def remove_command(index = nil)
+    def remove_command(id = nil)
       if @state == 'DISABLE'
         raise QueueError, "Queue '#{@name}' is disabled. Command not removed."
       end
 
-      if index
-        # Remove specific index
-        result = Store.zrangebyscore("#{@scope}:#{@name}", index, index)
+      if id
+        # Remove specific id
+        result = Store.zrangebyscore("#{@scope}:#{@name}", id, id)
         if result.empty?
           return nil
         else
-          Store.zremrangebyscore("#{@scope}:#{@name}", index, index)
+          Store.zremrangebyscore("#{@scope}:#{@name}", id, id)
           command_data = JSON.parse(result[0])
-          command_data['index'] = index.to_f
+          command_data['id'] = id.to_f
           notify(kind: 'command')
           return command_data
         end
@@ -164,7 +164,7 @@ module OpenC3
           score = result[0][1]
           Store.zremrangebyscore("#{@scope}:#{@name}", score, score)
           command_data = JSON.parse(result[0][0])
-          command_data['index'] = score.to_f
+          command_data['id'] = score.to_f
           notify(kind: 'command')
           return command_data
         end
@@ -174,7 +174,7 @@ module OpenC3
     def list
       return Store.zrange("#{@scope}:#{@name}", 0, -1, with_scores: true).map do |item|
         result = JSON.parse(item[0])
-        result['index'] = item[1].to_f
+        result['id'] = item[1].to_f
         result
       end
     end

data/lib/openc3/script/queue.rb

@@ -31,7 +31,7 @@ module OpenC3
         raise "Failed to #{action}. No response from server."
       elsif response.status != 200 and response.status != 201
         result = JSON.parse(response.body, allow_nan: true, create_additions: true)
-        raise "Failed to #{action} due to #{result['message']}"
+        raise "#{action} failed with status #{response.status}. #{result['message']}."
       end
       return JSON.parse(response.body, allow_nan: true, create_additions: true)
     end
@@ -66,12 +66,20 @@ module OpenC3
       return _make_request(action: 'disable queue', verb: 'post', uri: "/openc3-api/queues/#{name}/disable", scope: scope)
     end
 
-    def queue_exec(name, index: nil, scope: $openc3_scope)
+    def queue_exec(name, id=nil, scope: $openc3_scope)
       data = {}
-      data['index'] = index if index
+      data['id'] = id if id
       return _make_request(action: 'exec command', verb: 'post', uri: "/openc3-api/queues/#{name}/exec_command", data: data, scope: scope)
     end
 
+    # No queue_insert because we do that through the cmd APIs with the queue kwarg
+
+    def queue_remove(name, id=nil, scope: $openc3_scope)
+      data = {}
+      data['id'] = id if id
+      return _make_request(action: 'remove command', verb: 'post', uri: "/openc3-api/queues/#{name}/remove_command", data: data, scope: scope)
+    end
+
     def queue_delete(name, scope: $openc3_scope)
       return _make_request(action: 'delete queue', verb: 'delete', uri: "/openc3-api/queues/#{name}", scope: scope)
     end

data/lib/openc3/utilities/running_script.rb

@@ -458,8 +458,8 @@ class RunningScript
       start_time: start_time, # Time the script started ISO format
       end_time: nil, # Time the script ended ISO format
       disconnect: disconnect, # Disconnect is set to true if the script is running in a disconnected mode
-      environment: status_environment.as_json().to_json(allow_nan: true), # nil or Hash of key/value pairs for environment variables
-      suite_runner: suite_runner ? suite_runner.as_json().to_json(allow_nan: true) : nil,
+      environment: status_environment, # hash of environment variables set for the script
+      suite_runner: suite_runner ? suite_runner : nil, # current suite information if any
       errors: nil, # array of errors that occurred during the script run
       pid: nil, # pid of the script process - set by the script itself when it starts
       script_engine: script_engine, # script engine filename
@@ -770,7 +770,6 @@ class RunningScript
 
   def run
     if @script_status.suite_runner
-      @script_status.suite_runner = JSON.parse(@script_status.suite_runner, allow_nan: true, create_additions: true) # Convert to hash
       if @script_status.suite_runner['options']
         parse_options(@script_status.suite_runner['options'])
       else

data/lib/openc3/version.rb

@@ -1,14 +1,14 @@
 # encoding: ascii-8bit
 
-OPENC3_VERSION = '6.9.0'
+OPENC3_VERSION = '6.9.1'
 module OpenC3
   module Version
     MAJOR = '6'
     MINOR = '9'
-    PATCH = '0'
+    PATCH = '1'
     OTHER = ''
-    BUILD = '92d65ed951bb86b6b155f7e7b7327e889f58e314'
+    BUILD = 'e1529f7b88799a9f85f31378db40a48b6c106899'
   end
-  VERSION = '6.9.0'
-  GEM_VERSION = '6.9.0'
+  VERSION = '6.9.1'
+  GEM_VERSION = '6.9.1'
 end

data/templates/tool_angular/package.json

@@ -1,2 +1,2 @@
-  "version": "6.9.0",
-    "@openc3/js-common": "6.9.0",
+  "version": "6.9.1",
+    "@openc3/js-common": "6.9.1",

data/templates/tool_react/package.json

@@ -1 +1 @@
-    "@openc3/js-common": "6.9.0",
+    "@openc3/js-common": "6.9.1",

data/templates/tool_svelte/package.json

@@ -1 +1 @@
-    "@openc3/js-common": "6.9.0",
+    "@openc3/js-common": "6.9.1",

data/templates/tool_vue/package.json

@@ -1,3 +1,3 @@
-  "version": "6.9.0",
-    "@openc3/js-common": "6.9.0",
-    "@openc3/vue-common": "6.9.0",
+  "version": "6.9.1",
+    "@openc3/js-common": "6.9.1",
+    "@openc3/vue-common": "6.9.1",

data/templates/widget/package.json

@@ -1,2 +1,2 @@
-  "version": "6.9.0",
-    "@openc3/vue-common": "6.9.0",
+  "version": "6.9.1",
+    "@openc3/vue-common": "6.9.1",

metadata

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