openc3 5.4.3.pre.beta0 → 5.5.0

data/lib/openc3/script/web_socket_api.rb

@@ -0,0 +1,423 @@
+# encoding: ascii-8bit
+
+# Copyright 2023 OpenC3, Inc.
+# All Rights Reserved.
+#
+# This program is free software; you can modify and/or redistribute it
+# under the terms of the GNU Affero General Public License
+# as published by the Free Software Foundation; version 3 with
+# attribution addendums as found in the LICENSE.txt
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# This file may also be used under the terms of a commercial license
+# if purchased from OpenC3, Inc.
+
+require 'openc3/streams/web_socket_client_stream'
+require 'openc3/utilities/authentication'
+require 'openc3/io/json_rpc'
+
+module OpenC3
+  # Base class - Do not use directly
+  class WebSocketApi
+    USER_AGENT = 'OpenC3 / v5 (ruby/openc3/lib/io/web_socket_api)'.freeze
+
+    # Create the WebsocketApi object. If a block is given will automatically connect/disconnect
+    def initialize(url:, write_timeout: 10.0, read_timeout: 10.0, connect_timeout: 5.0, authentication: nil, scope: $openc3_scope, &block)
+      @scope = scope
+      @authentication = authentication.nil? ? generate_auth() : authentication
+      @url = url
+      @write_timeout = write_timeout
+      @read_timeout = read_timeout
+      @connect_timeout = connect_timeout
+      @subscribed = false
+      if block_given?
+        begin
+          connect()
+          yield self
+        ensure
+          disconnect()
+        end
+      end
+    end
+
+    # Read the next message without filtering / parsing
+    def read_message
+      subscribe()
+      return @stream.read
+    end
+
+    # Read the next message with json parsing, filtering, and timeout support
+    def read(ignore_protocol_messages: true, timeout: nil)
+      start_time = Time.now
+      while true
+        message = read_message()
+        if message
+          json_hash = JSON.parse(message, allow_nan: true, create_additions: true)
+          if ignore_protocol_messages
+            type = json_hash['type']
+            if type # ping, welcome, confirm_subscription, reject_subscription, disconnect
+              if type == 'disconnect'
+                if json_hash['reason'] == 'unauthorized'
+                  raise "Unauthorized"
+                end
+              end
+              if type == 'reject_subscription'
+                raise "Subscription Rejected"
+              end
+              if timeout
+                end_time = Time.now
+                if (start_time - end_time) > timeout
+                  raise Timeout::Error, "No Data Timeout"
+                end
+              end
+              if defined? RunningScript and RunningScript.instance
+                raise StopScript if RunningScript.instance.stop?
+              end
+              next
+            end
+          end
+          return json_hash['message']
+        end
+        return message
+      end
+    end
+
+    # Will subscribe to the channel based on @identifier
+    def subscribe
+      unless @subscribed
+        json_hash = {}
+        json_hash['command'] = 'subscribe'
+        json_hash['identifier'] = JSON.generate(@identifier)
+        @stream.write(JSON.generate(json_hash))
+        @subscribed = true
+      end
+    end
+
+    # Will unsubscribe to the channel based on @identifier
+    def unsubscribe
+      if @subscribed
+        json_hash = {}
+        json_hash['command'] = 'unsubscribe'
+        json_hash['identifier'] = JSON.generate(@identifier)
+        @stream.write(JSON.generate(json_hash))
+        @subscribed = false
+      end
+    end
+
+    # Send an ActionCable command
+    def write_action(data_hash)
+      json_hash = {}
+      json_hash['command'] = 'message'
+      json_hash['identifier'] = JSON.generate(@identifier)
+      json_hash['data'] = JSON.generate(data_hash)
+      write(JSON.generate(json_hash))
+    end
+
+    # General write to the websocket
+    def write(data)
+      subscribe()
+      @stream.write(data)
+    end
+
+    # Connect to the websocket with authorization in query params
+    def connect
+      disconnect()
+      final_url = @url + "?scope=#{@scope}&authorization=#{@authentication.token}"
+      @stream = WebSocketClientStream.new(final_url, @write_timeout, @read_timeout, @connect_timeout)
+      @stream.headers = {
+        'Sec-WebSocket-Protocol' => 'actioncable-v1-json, actioncable-unsupported',
+        'User-Agent' => USER_AGENT
+      }
+      @stream.connect
+    end
+
+    # Are we connected?
+    def connected?
+      if @stream
+        @stream.connected?
+      else
+        false
+      end
+    end
+
+    # Disconnect from the websocket and attempt to send unsubscribe message
+    def disconnect
+      if connected?()
+        begin
+          unsubscribe()
+        rescue
+          # Oh well, we tried
+        end
+        @stream.disconnect
+      end
+    end
+
+    # private
+
+    # Generate the appropriate token for OpenC3
+    def generate_auth
+      if ENV['OPENC3_API_TOKEN'].nil? and ENV['OPENC3_API_USER'].nil?
+        if ENV['OPENC3_API_PASSWORD'] || ENV['OPENC3_SERVICE_PASSWORD']
+          return OpenC3Authentication.new()
+        else
+          raise "Environment Variables Not Set for Authentication"
+        end
+      else
+        return OpenC3KeycloakAuthentication.new(ENV['OPENC3_KEYCLOAK_URL'])
+      end
+    end
+  end
+
+  # Base class for cmd-tlm-api websockets - Do not use directly
+  class CmdTlmWebSocketApi < WebSocketApi
+    def initialize(url: nil, write_timeout: 10.0, read_timeout: 10.0, connect_timeout: 5.0, authentication: nil, scope: $openc3_scope)
+      url = generate_url() unless url
+      super(url: url, write_timeout: write_timeout, read_timeout: read_timeout, connect_timeout: connect_timeout, authentication: authentication, scope: scope)
+    end
+
+    def generate_url
+      schema = ENV['OPENC3_API_SCHEMA'] || 'http'
+      hostname = ENV['OPENC3_API_HOSTNAME'] || (ENV['OPENC3_DEVEL'] ? '127.0.0.1' : 'openc3-cosmos-cmd-tlm-api')
+      port = ENV['OPENC3_API_PORT'] || '2901'
+      port = port.to_i
+      return "#{schema}://#{hostname}:#{port}/openc3-api/cable"
+    end
+  end
+
+  # Base class for script-runner-api websockets - Do not use directly
+  class ScriptWebSocketApi < WebSocketApi
+    def initialize(url: nil, write_timeout: 10.0, read_timeout: 10.0, connect_timeout: 5.0, authentication: nil, scope: $openc3_token)
+      url = generate_url() unless url
+      super(url: url, write_timeout: write_timeout, read_timeout: read_timeout, connect_timeout: connect_timeout, authentication: authentication, scope: scope)
+    end
+
+    def generate_url
+      schema = ENV['OPENC3_SCRIPT_API_SCHEMA'] || 'http'
+      hostname = ENV['OPENC3_SCRIPT_API_HOSTNAME'] || (ENV['OPENC3_DEVEL'] ? '127.0.0.1' : 'openc3-cosmos-script-runner-api')
+      port = ENV['OPENC3_SCRIPT_API_PORT'] || '2902'
+      port = port.to_i
+      return "#{schema}://#{hostname}:#{port}/script-api/cable"
+    end
+  end
+
+  # Running Script WebSocket
+  class RunningScriptWebSocketApi < ScriptWebSocketApi
+    def initialize(id:, url: nil, write_timeout: 10.0, read_timeout: 10.0, connect_timeout: 5.0, authentication: nil, scope: $openc3_scope)
+      @identifier = {
+        channel: "RunningScriptChannel",
+        id: id
+      }
+      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, url: nil, write_timeout: 10.0, read_timeout: 10.0, connect_timeout: 5.0, authentication: nil, scope: $openc3_scope)
+      @identifier = {
+        channel: "MessagesChannel",
+        history_count: history_count
+      }
+      super(url: url, write_timeout: write_timeout, read_timeout: read_timeout, connect_timeout: connect_timeout, authentication: authentication, scope: scope)
+    end
+  end
+
+  # Notifications WebSocket
+  class NotificationsWebSocketApi < CmdTlmWebSocketApi
+    def initialize(history_count: 0, start_offset: nil, url: nil, write_timeout: 10.0, read_timeout: 10.0, connect_timeout: 5.0, authentication: nil, scope: $openc3_scope)
+      @identifier = {
+        channel: "NotificationsChannel",
+        history_count: history_count,
+        start_offset: start_offset
+      }
+      super(url: url, write_timeout: write_timeout, read_timeout: read_timeout, connect_timeout: connect_timeout, authentication: authentication, scope: scope)
+    end
+  end
+
+  # Autonomic Events WebSocket
+  class AutonomicEventsWebSocketApi < CmdTlmWebSocketApi
+    def initialize(history_count: 0, url: nil, write_timeout: 10.0, read_timeout: 10.0, connect_timeout: 5.0, authentication: nil, scope: $openc3_scope)
+      @identifier = {
+        channel: "AutonomicEventsChannel",
+        history_count: history_count
+      }
+      super(url: url, write_timeout: write_timeout, read_timeout: read_timeout, connect_timeout: connect_timeout, authentication: authentication, scope: scope)
+    end
+  end
+
+  # Calendar Events WebSocket
+  class CalendarEventsWebSocketApi < CmdTlmWebSocketApi
+    def initialize(history_count: 0, url: nil, write_timeout: 10.0, read_timeout: 10.0, connect_timeout: 5.0, authentication: nil, scope: $openc3_scope)
+      @identifier = {
+        channel: "CalendarEventsChannel",
+        history_count: history_count
+      }
+      super(url: url, write_timeout: write_timeout, read_timeout: read_timeout, connect_timeout: connect_timeout, authentication: authentication, scope: scope)
+    end
+  end
+
+  # Config Events WebSocket
+  class ConfigEventsWebSocketApi < CmdTlmWebSocketApi
+    def initialize(history_count: 0, url: nil, write_timeout: 10.0, read_timeout: 10.0, connect_timeout: 5.0, authentication: nil, scope: $openc3_scope)
+      @identifier = {
+        channel: "ConfigEventsChannel",
+        history_count: history_count
+      }
+      super(url: url, write_timeout: write_timeout, read_timeout: read_timeout, connect_timeout: connect_timeout, authentication: authentication, scope: scope)
+    end
+  end
+
+  # Limits Events WebSocket
+  class LimitsEventsWebSocketApi < CmdTlmWebSocketApi
+    def initialize(history_count: 0, url: nil, write_timeout: 10.0, read_timeout: 10.0, connect_timeout: 5.0, authentication: nil, scope: $openc3_scope)
+      @identifier = {
+        channel: "LimitsEventsChannel",
+        history_count: history_count
+      }
+      super(url: url, write_timeout: write_timeout, read_timeout: read_timeout, connect_timeout: connect_timeout, authentication: authentication, scope: scope)
+    end
+  end
+
+  # Timeline WebSocket
+  class TimelineEventsWebSocketApi < CmdTlmWebSocketApi
+    def initialize(history_count: 0, url: nil, write_timeout: 10.0, read_timeout: 10.0, connect_timeout: 5.0, authentication: nil, scope: $openc3_scope)
+      @identifier = {
+        channel: "TimelineEventsChannel",
+        history_count: history_count
+      }
+      super(url: url, write_timeout: write_timeout, read_timeout: read_timeout, connect_timeout: connect_timeout, authentication: authentication, scope: scope)
+    end
+  end
+
+  # Streaming API WebSocket
+  class StreamingWebSocketApi < CmdTlmWebSocketApi
+    def initialize(url: nil, write_timeout: 10.0, read_timeout: 10.0, connect_timeout: 5.0, authentication: nil, scope: $openc3_scope)
+      @identifier = {
+        channel: "StreamingChannel"
+      }
+      super(url: url, write_timeout: write_timeout, read_timeout: read_timeout, connect_timeout: connect_timeout, authentication: authentication, scope: scope)
+    end
+
+    # Request to add data to the stream
+    #
+    # arguments:
+    # scope: scope name
+    # start_time: 64-bit nanoseconds from unix epoch - If not present then realtime
+    # end_time: 64-bit nanoseconds from unix epoch - If not present stream forever
+    # items: [ [ MODE__CMDORTLM__TARGET__PACKET__ITEM__VALUETYPE__REDUCEDTYPE, item_key] ]
+    #   MODE - RAW, DECOM, REDUCED_MINUTE, REDUCED_HOUR, or REDUCED_DAY
+    #   CMDORTLM - CMD or TLM
+    #   TARGET - Target name
+    #   PACKET - Packet name
+    #   ITEM - Item Name
+    #   VALUETYPE - RAW, CONVERTED, FORMATTED, or WITH_UNITS
+    #   REDUCEDTYPE - MIN, MAX, AVG, STDDEV (only for reduced modes)
+    #   item_key is an optional shortened name to return the data as
+    # packets: [ MODE__CMDORTLM__TARGET__PACKET__VALUETYPE ]
+    #   MODE - RAW, DECOM, REDUCED_MINUTE, REDUCED_HOUR, or REDUCED_DAY
+    #   CMDORTLM - CMD or TLM
+    #   TARGET - Target name
+    #   PACKET - Packet name
+    #   VALUETYPE - RAW, CONVERTED, FORMATTED, WITH_UNITS, or PURE (pure means all types as stored in log)
+    #
+    def add(items: nil, packets: nil, start_time: nil, end_time: nil, scope: $openc3_scope)
+      data_hash = {}
+      data_hash['action'] = 'add'
+      if start_time
+        if Time === start_time
+          start_time = start_time.to_nsec_from_epoch
+        end
+        data_hash['start_time'] = start_time
+      end
+      if end_time
+        if Time === end_time
+          end_time = end_time.to_nsec_from_epoch
+        end
+        data_hash['end_time'] = end_time
+      end
+      data_hash['items'] = items if items
+      data_hash['packets'] = packets if packets
+      data_hash['scope'] = scope
+      data_hash['token'] = @authentication.token
+      write_action(data_hash)
+    end
+
+    # Request to remove data from the stream
+    #
+    # arguments:
+    # scope: scope name
+    # items: [ [ MODE__CMDORTLM__TARGET__PACKET__ITEM__VALUETYPE__REDUCEDTYPE] ]
+    #   MODE - RAW, DECOM, REDUCED_MINUTE, REDUCED_HOUR, or REDUCED_DAY
+    #   CMDORTLM - CMD or TLM
+    #   TARGET - Target name
+    #   PACKET - Packet name
+    #   ITEM - Item Name
+    #   VALUETYPE - RAW, CONVERTED, FORMATTED, or WITH_UNITS
+    #   REDUCEDTYPE - MIN, MAX, AVG, STDDEV (only for reduced modes)
+    # packets: [ MODE__CMDORTLM__TARGET__PACKET__VALUETYPE ]
+    #   MODE - RAW, DECOM, REDUCED_MINUTE, REDUCED_HOUR, or REDUCED_DAY
+    #   CMDORTLM - CMD or TLM
+    #   TARGET - Target name
+    #   PACKET - Packet name
+    #   VALUETYPE - RAW, CONVERTED, FORMATTED, WITH_UNITS, or PURE (pure means all types as stored in log)
+    #
+    def remove(items: nil, packets: nil, scope: $openc3_scope)
+      data_hash = {}
+      data_hash['action'] = 'remove'
+      data_hash['items'] = items if items
+      data_hash['packets'] = packets if packets
+      data_hash['scope'] = scope
+      data_hash['token'] = @authentication.token
+      write_action(data_hash)
+    end
+
+    # Convenience method to read all data until end marker is received.
+    # Warning: DATA IS STORED IN RAM.  Do not use this with large queries
+    def self.read_all(items: nil, packets: nil, start_time: nil, end_time:, scope: $openc3_scope, timeout: nil)
+      read_all_start_time = Time.now
+      data = []
+      self.new do |api|
+        api.add(items: items, packets: packets, start_time: start_time, end_time: end_time, scope: scope)
+        while true
+          batch = api.read
+          if batch.length == 0
+            return data
+          else
+            data.concat(batch)
+          end
+          if timeout
+            if (Time.now - read_all_start_time) > timeout
+              return data
+            end
+          end
+        end
+      end
+    end
+  end
+end
+
+# # Example Use
+# $openc3_scope = 'DEFAULT'
+# ENV['OPENC3_API_HOSTNAME'] = 'localhost'
+# ENV['OPENC3_API_PORT'] = '2900'
+# ENV['OPENC3_SCRIPT_API_HOSTNAME'] = 'localhost'
+# ENV['OPENC3_SCRIPT_API_PORT'] = '2900'
+# ENV['OPENC3_API_PASSWORD'] = 'password'
+#
+# OpenC3::StreamingWebSocketApi.new do |api|
+#   api.add(items: ['DECOM__TLM__INST__HEALTH_STATUS__TEMP1__CONVERTED', 'DECOM__TLM__INST__HEALTH_STATUS__TEMP2__CONVERTED'])
+#   5.times do
+#     puts api.read
+#   end
+#   api.remove(items: ['DECOM__TLM__INST__HEALTH_STATUS__TEMP1__CONVERTED'])
+#   5.times do
+#     puts api.read
+#   end
+# end
+#
+# # Warning this saves all data to RAM. Do not use for large queries
+# data = OpenC3::StreamingWebSocketApi.read_all(items: ['DECOM__TLM__INST__HEALTH_STATUS__TEMP1__CONVERTED', 'DECOM__TLM__INST__HEALTH_STATUS__TEMP2__CONVERTED'], end_time: Time.now + 30)

data/lib/openc3/streams/tcpip_client_stream.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 'socket'

data/lib/openc3/streams/web_socket_client_stream.rb

@@ -0,0 +1,98 @@
+# encoding: ascii-8bit
+
+# Copyright 2023 OpenC3, Inc.
+# All Rights Reserved.
+#
+# This program is free software; you can modify and/or redistribute it
+# under the terms of the GNU Affero General Public License
+# as published by the Free Software Foundation; version 3 with
+# attribution addendums as found in the LICENSE.txt
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# This file may also be used under the terms of a commercial license
+# if purchased from OpenC3, Inc.
+
+require 'openssl'
+require 'openc3/streams/tcpip_client_stream'
+require 'websocket'
+require 'uri'
+
+module OpenC3
+  class WebSocketClientStream < TcpipClientStream
+    attr_accessor :headers
+
+    # @param url [String] The host to connect to
+    # @param write_timeout (see TcpipSocketStream#initialize)
+    # @param read_timeout (see TcpipSocketStream#initialize)
+    # @param connect_timeout (see TcpipClientStream#initialize)
+    def initialize(url, write_timeout, read_timeout, connect_timeout = 5.0)
+      @url = url
+      @uri = URI.parse @url
+      port = ((@uri.scheme == 'wss' or @uri.scheme == 'https') ? 443 : 80)
+      port = @uri.port if @uri.port
+      super(@uri.host, port, port, write_timeout, read_timeout, connect_timeout)
+      if ['https', 'wss'].include? @uri.scheme
+        socket = ::OpenSSL::SSL::SSLSocket.new(@write_socket)
+        socket.sync_close = true
+        socket.hostname = @uri.host
+        @write_socket = socket
+        @read_socket = socket
+      end
+      @headers = {}
+    end
+
+    def connect
+      super()
+      @handshake = ::WebSocket::Handshake::Client.new(:url => @url, :headers => @headers)
+      @frame = ::WebSocket::Frame::Incoming::Client.new
+      @handshaked = false
+      @write_socket.write(@handshake.to_s)
+      read() # This should wait for the handshake
+      return true
+    end
+
+    def read
+      while true
+        if @handshaked
+          msg = @frame.next
+          return msg.data if msg
+        end
+
+        data = super()
+        return data if data.length <= 0
+
+        if @handshaked
+          @frame << data
+          msg = @frame.next
+          return msg.data if msg
+        else
+          index = 0
+          chars = ""
+          data.each_char do |char|
+            @handshake << char
+            chars << char
+            index += 1
+            if @handshake.finished?
+              @handshaked = true
+              break
+            end
+          end
+          if @handshaked
+            data = data[index..-1]
+            @frame << data
+            return
+          end
+        end
+      end
+    end
+
+    def write(data, type: :text)
+      frame = ::WebSocket::Frame::Outgoing::Client.new(:data => data, :type => type, :version => @handshake.version)
+      super(frame.to_s)
+    end
+  end
+end

data/lib/openc3/tools/table_manager/table_manager_core.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'
@@ -148,7 +148,6 @@ module OpenC3
         }
         col = 0
         row = 0
-        num_cols = table.num_columns
         table.sorted_items.each_with_index do |item, index|
           next if item.hidden
           if table.num_columns == 1

data/lib/openc3/utilities/aws_bucket.rb

@@ -111,7 +111,12 @@ module OpenC3
       token = nil
       result = []
       while true
-        resp = @client.list_objects_v2(bucket: bucket, prefix: prefix, max_keys: max_request)
+        resp = @client.list_objects_v2({
+          bucket: bucket,
+          max_keys: max_request,
+          prefix: prefix,
+          continuation_token: token
+        })
         result.concat(resp.contents)
         break if result.length >= max_total
         break unless resp.is_truncated
@@ -119,12 +124,12 @@ module OpenC3
       end
       # Array of objects with key and size methods
       result
-    rescue Aws::S3::Errors::NoSuchBucket => error
+    rescue Aws::S3::Errors::NoSuchBucket
       raise NotFound, "Bucket '#{bucket}' does not exist."
     end
 
     # Lists the files under a specified path
-    def list_files(bucket:, path:, only_directories: false)
+    def list_files(bucket:, path:, only_directories: false, include_head: false)
       # Trailing slash is important in AWS S3 when listing files
       # See https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/S3/Types/ListObjectsV2Output.html#common_prefixes-instance_method
       if path[-1] != '/'
@@ -158,6 +163,9 @@ module OpenC3
             item['name'] = aws_item.key.split('/')[-1]
             item['modified'] = aws_item.last_modified
             item['size'] = aws_item.size
+            if include_head
+              item['head'] = head_object(bucket: bucket, key: aws_item.key)
+            end
             files << item
           end
           result = [dirs, files]
@@ -166,10 +174,20 @@ module OpenC3
         token = resp.next_continuation_token
       end
       result
-    rescue Aws::S3::Errors::NoSuchBucket => error
+    rescue Aws::S3::Errors::NoSuchBucket
       raise NotFound, "Bucket '#{bucket}' does not exist."
     end
 
+    # get metadata for a specific object
+    def head_object(bucket:, key:)
+      head = @client.head_object({
+        bucket: bucket,
+        key: key
+      })
+    rescue Aws::S3::Errors::NotFound => error
+      raise NotFound, "Object: #{bucket}/#{key}"
+    end
+
     # put_object fires off the request to store but does not confirm
     def put_object(bucket:, key:, body:, content_type: nil, cache_control: nil, metadata: nil)
       @client.put_object(bucket: bucket, key: key, body: body,

data/lib/openc3/utilities/bucket_file_cache.rb

@@ -57,10 +57,10 @@ class BucketFile
     cmd_or_tlm = path_split[2].to_s.upcase
     target_name = path_split[3].to_s.upcase
     if stream_mode == 'RAW'
-      type = (@cmd_or_tlm == 'CMD') ? 'COMMAND' : 'TELEMETRY'
+      type = (cmd_or_tlm == 'CMD') ? 'COMMAND' : 'TELEMETRY'
     else
       if stream_mode == 'DECOM'
-        type = (@cmd_or_tlm == 'CMD') ? 'DECOMCMD' : 'DECOM'
+        type = (cmd_or_tlm == 'CMD') ? 'DECOMCMD' : 'DECOM'
       else
         type = stream_mode # REDUCED_MINUTE, REDUCED_HOUR, or REDUCED_DAY
       end
@@ -156,6 +156,7 @@ class BucketFileCache
     @current_disk_usage = 0
     @queued_bucket_files = []
     @bucket_file_hash = {}
+    bucket_file = nil
 
     @thread = Thread.new do
       client = OpenC3::Bucket.getClient()

data/lib/openc3/utilities/bucket_utilities.rb

@@ -162,7 +162,7 @@ module OpenC3
 
     def self.get_file_times(bucket_path)
       basename = File.basename(bucket_path)
-      file_start_timestamp, file_end_timestamp, other = basename.split("__")
+      file_start_timestamp, file_end_timestamp, _ = basename.split("__")
       file_start_time = DateTime.strptime(file_start_timestamp, FILE_TIMESTAMP_FORMAT).to_time
       file_end_time = DateTime.strptime(file_end_timestamp, FILE_TIMESTAMP_FORMAT).to_time
       return file_start_time, file_end_time