openc3 6.8.1 → 6.9.0

data/lib/openc3/microservices/router_microservice.rb

@@ -25,7 +25,7 @@ require 'openc3/microservices/interface_microservice'
 module OpenC3
   class RouterMicroservice < InterfaceMicroservice
     def handle_packet(packet)
-      RouterStatusModel.set(@interface.as_json(:allow_nan => true), scope: @scope)
+      RouterStatusModel.set(@interface.as_json(), scope: @scope)
       if !packet.identified?
         # Need to identify so we can find the target
         identified_packet = System.commands.identify(packet.buffer(false), @interface.cmd_target_names)
@@ -50,37 +50,40 @@ module OpenC3
       target_name = 'UNKNOWN' unless target_name
       target = System.targets[target_name]
 
-      begin
+      # Don't route disabled target names
+      if @interface.cmd_target_enabled[target_name]
         begin
-          log_message = true # Default is true
-          # If the packet has the DISABLE_MESSAGES keyword then no messages by default
-          log_message = false if packet.messages_disabled
-          # Check if any of the parameters have DISABLE_MESSAGES
-          packet.sorted_items.each do |item|
-            if item.states and item.messages_disabled
-              value = packet.read_item(item)
-              if item.messages_disabled[value]
-                log_message = false
-                break
+          begin
+            log_message = true # Default is true
+            # If the packet has the DISABLE_MESSAGES keyword then no messages by default
+            log_message = false if packet.messages_disabled
+            # Check if any of the parameters have DISABLE_MESSAGES
+            packet.sorted_items.each do |item|
+              if item.states and item.messages_disabled
+                value = packet.read_item(item)
+                if item.messages_disabled[value]
+                  log_message = false
+                  break
+                end
               end
             end
-          end
 
-          if log_message
-            if target and target_name != 'UNKNOWN'
-              @logger.info System.commands.format(packet, target.ignored_parameters)
-            else
-              @logger.warn "Unidentified packet of #{packet.length} bytes being routed to target #{@interface.cmd_target_names[0]}"
+            if log_message
+              if target and target_name != 'UNKNOWN'
+                @logger.info System.commands.format(packet, target.ignored_parameters)
+              else
+                @logger.warn "Unidentified packet of #{packet.length} bytes being routed to target #{@interface.cmd_target_names[0]}"
+              end
             end
+          rescue => err
+            @logger.error "Problem formatting command from router:\n#{err.formatted}"
           end
-        rescue => err
-          @logger.error "Problem formatting command from router:\n#{err.formatted}"
-        end
 
-        RouterTopic.route_command(packet, @interface.cmd_target_names, scope: @scope)
-      rescue Exception => err
-        @error = err
-        @logger.error "Error routing command from #{@interface.name}\n#{err.formatted}"
+          RouterTopic.route_command(packet, @interface.cmd_target_names, scope: @scope)
+        rescue Exception => err
+          @error = err
+          @logger.error "Error routing command from #{@interface.name}\n#{err.formatted}"
+        end
       end
     end
   end

data/lib/openc3/models/activity_model.rb

@@ -56,13 +56,13 @@ module OpenC3
         raise ActivityInputError.new "start: #{start} must be <= stop: #{stop}"
       end
       array = Store.zrangebyscore("#{scope}#{PRIMARY_KEY}__#{name}", start, stop, :limit => [0, limit])
-      return array.map { |value| JSON.parse(value, :allow_nan => true, :create_additions => true) }
+      return array.map { |value| JSON.parse(value, allow_nan: true, create_additions: true) }
     end
 
     # @return [Array<Hash>] Array up to the limit of the models (as Hash objects) stored under the primary key
     def self.all(name:, scope:, limit: 100)
       array = Store.zrange("#{scope}#{PRIMARY_KEY}__#{name}", 0, -1, :limit => [0, limit])
-      return array.map { |value| JSON.parse(value, :allow_nan => true, :create_additions => true) }
+      return array.map { |value| JSON.parse(value, allow_nan: true, create_additions: true) }
     end
 
     # @return [String|nil] String of the saved json or nil if score not found under primary_key
@@ -108,7 +108,7 @@ module OpenC3
 
       # First find all the activities at the score
       json = Store.zrangebyscore("#{scope}#{PRIMARY_KEY}__#{name}", score, score, :limit => [0, 100])
-      parsed = json.map { |value| JSON.parse(value, :allow_nan => true, :create_additions => true) }
+      parsed = json.map { |value| JSON.parse(value, allow_nan: true, create_additions: true) }
       parsed.each_with_index do |value, index|
         if uuid
           # If the uuid is given then only delete activities that match the uuid
@@ -128,7 +128,7 @@ module OpenC3
 
       notification = {
         # start / stop to match SortedModel
-        'data' => JSON.generate({'start' => score, 'uuid' => uuid}),
+        'data' => JSON.generate({'start' => score, 'uuid' => uuid}, allow_nan: true),
         'kind' => 'deleted',
         'type' => 'activity',
         'timeline' => name
@@ -143,7 +143,7 @@ module OpenC3
       result = Store.zremrangebyscore("#{scope}#{PRIMARY_KEY}__#{name}", min, max)
       notification = {
         # start / stop to match SortedModel
-        'data' => JSON.generate({'start' => min, 'stop' => max}),
+        'data' => JSON.generate({'start' => min, 'stop' => max}, allow_nan: true),
         'kind' => 'deleted',
         'type' => 'activity',
         'timeline' => name
@@ -154,7 +154,7 @@ module OpenC3
 
     # @return [ActivityModel] Model generated from the passed JSON
     def self.from_json(json, name:, scope:)
-      json = JSON.parse(json, :allow_nan => true, :create_additions => true) if String === json
+      json = JSON.parse(json, allow_nan: true, create_additions: true) if String === json
       raise "json data is nil" if json.nil?
       self.new(**json.transform_keys(&:to_sym), name: name, scope: scope)
     end
@@ -204,7 +204,7 @@ module OpenC3
       # Adding a '(' makes the max value exclusive
       array = Store.zrevrangebyscore(@primary_key, "(#{stop}", start - MAX_DURATION)
       array.each do |value|
-        activity = JSON.parse(value, :allow_nan => true, :create_additions => true)
+        activity = JSON.parse(value, allow_nan: true, create_additions: true)
         if ignore_score == activity['start']
           next
         elsif activity['stop'] > start
@@ -289,7 +289,7 @@ module OpenC3
           # Get all the existing events in the recurring time range as well as those before
           # the start of the recurring time range to ensure we don't start inside an existing event
           existing = Store.zrevrangebyscore(@primary_key, @recurring['end'] - 1, @recurring['start'] - MAX_DURATION)
-          existing.map! {|value| JSON.parse(value, :allow_nan => true, :create_additions => true) }
+          existing.map! {|value| JSON.parse(value, allow_nan: true, create_additions: true) }
         end
         last_stop = nil
 
@@ -315,7 +315,7 @@ module OpenC3
                 end
               end
             end
-            multi.zadd(@primary_key, @start, JSON.generate(self.as_json(:allow_nan => true)))
+            multi.zadd(@primary_key, @start, JSON.generate(self.as_json, allow_nan: true))
             last_stop = @stop
           end
         end
@@ -331,7 +331,7 @@ module OpenC3
         end
         @updated_at = Time.now.to_nsec_from_epoch
         add_event(status: 'created')
-        Store.zadd(@primary_key, @start, JSON.generate(self.as_json(:allow_nan => true)))
+        Store.zadd(@primary_key, @start, JSON.generate(self.as_json, allow_nan: true))
         notify(kind: 'created')
       end
     end
@@ -359,12 +359,12 @@ module OpenC3
 
       add_event(status: 'updated')
       json = Store.zrangebyscore(@primary_key, old_start, old_start)
-      parsed = json.map { |value| JSON.parse(value, :allow_nan => true, :create_additions => true) }
+      parsed = json.map { |value| JSON.parse(value, allow_nan: true, create_additions: true) }
       parsed.each_with_index do |value, index|
         if value['uuid'] == old_uuid
           Store.multi do |multi|
             multi.zrem(@primary_key, json[index])
-            multi.zadd(@primary_key, @start, JSON.generate(self.as_json(:allow_nan => true)))
+            multi.zadd(@primary_key, @start, JSON.generate(self.as_json, allow_nan: true))
           end
         end
       end
@@ -375,9 +375,10 @@ module OpenC3
     # commit will make an event and save the object to the redis database
     # @param [String] status - the event status such as "complete" or "failed"
     # @param [String] message - an optional message to include in the event
-    def commit(status:, message: nil, fulfillment: nil)
+    # @param [Time] timestamp - optional timestamp to use instead of current time
+    def commit(status:, message: nil, fulfillment: nil, timestamp: nil)
       event = {
-        'time' => Time.now.to_i,
+        'time' => timestamp ? timestamp.to_i : Time.now.to_i,
         'event' => status,
         'commit' => true
       }
@@ -386,12 +387,12 @@ module OpenC3
       @events << event
 
       json = Store.zrangebyscore(@primary_key, @start, @start)
-      parsed = json.map { |value| JSON.parse(value, :allow_nan => true, :create_additions => true) }
+      parsed = json.map { |value| JSON.parse(value, allow_nan: true, create_additions: true) }
       parsed.each_with_index do |value, index|
         if value['uuid'] == @uuid
           Store.multi do |multi|
             multi.zrem(@primary_key, json[index])
-            multi.zadd(@primary_key, @start, JSON.generate(self.as_json(:allow_nan => true)))
+            multi.zadd(@primary_key, @start, JSON.generate(self.as_json, allow_nan: true))
           end
         end
       end
@@ -411,7 +412,7 @@ module OpenC3
     # update the redis stream / timeline topic that something has changed
     def notify(kind:, extra: nil)
       notification = {
-        'data' => JSON.generate(as_json(:allow_nan => true)),
+        'data' => JSON.generate(as_json, allow_nan: true),
         'kind' => kind,
         'type' => 'activity',
         'timeline' => @name

data/lib/openc3/models/cvt_model.rb

@@ -48,7 +48,7 @@ module OpenC3
 
     # Set the current value table for a target, packet
     def self.set(hash, target_name:, packet_name:, queued: false, scope: $openc3_scope)
-      packet_json = JSON.generate(hash.as_json(:allow_nan => true))
+      packet_json = JSON.generate(hash.as_json, allow_nan: true)
       key = "#{scope}__tlm__#{target_name}"
       tgt_pkt_key = key + "__#{packet_name}"
       @@packet_cache[tgt_pkt_key] = [Time.now, hash]
@@ -71,7 +71,7 @@ module OpenC3
       end
       packet = Store.hget(key, packet_name)
       raise "Packet '#{target_name} #{packet_name}' does not exist" unless packet
-      hash = JSON.parse(packet, :allow_nan => true, :create_additions => true)
+      hash = JSON.parse(packet, allow_nan: true, create_additions: true)
       @@packet_cache[tgt_pkt_key] = [now, hash]
       hash
     end
@@ -310,7 +310,7 @@ module OpenC3
         all = Store.hgetall("#{scope}__override__#{target_name}")
         next if all.nil? or all.empty?
         all.each do |packet_name, hash|
-          items = JSON.parse(hash, :allow_nan => true, :create_additions => true)
+          items = JSON.parse(hash, allow_nan: true, create_additions: true)
           items.each do |key, value|
             item = {}
             item['target_name'] = target_name
@@ -339,7 +339,7 @@ module OpenC3
     # for the given type
     def self.override(target_name, packet_name, item_name, value, type: :ALL, scope: $openc3_scope)
       hash = Store.hget("#{scope}__override__#{target_name}", packet_name)
-      hash = JSON.parse(hash, :allow_nan => true, :create_additions => true) if hash
+      hash = JSON.parse(hash, allow_nan: true, create_additions: true) if hash
       hash ||= {} # In case the above didn't create anything
       case type
       when :ALL
@@ -361,13 +361,13 @@ module OpenC3
 
       tgt_pkt_key = "#{scope}__tlm__#{target_name}__#{packet_name}"
       @@override_cache[tgt_pkt_key] = [Time.now, hash]
-      Store.hset("#{scope}__override__#{target_name}", packet_name, JSON.generate(hash.as_json(:allow_nan => true)))
+      Store.hset("#{scope}__override__#{target_name}", packet_name, JSON.generate(hash.as_json, allow_nan: true))
     end
 
     # Normalize a current value table item such that it returns the actual value
     def self.normalize(target_name, packet_name, item_name, type: :ALL, scope: $openc3_scope)
       hash = Store.hget("#{scope}__override__#{target_name}", packet_name)
-      hash = JSON.parse(hash, :allow_nan => true, :create_additions => true) if hash
+      hash = JSON.parse(hash, allow_nan: true, create_additions: true) if hash
       hash ||= {} # In case the above didn't create anything
       case type
       when :ALL
@@ -393,7 +393,7 @@ module OpenC3
         Store.hdel("#{scope}__override__#{target_name}", packet_name)
       else
         @@override_cache[tgt_pkt_key] = [Time.now, hash]
-        Store.hset("#{scope}__override__#{target_name}", packet_name, JSON.generate(hash.as_json(:allow_nan => true)))
+        Store.hset("#{scope}__override__#{target_name}", packet_name, JSON.generate(hash.as_json, allow_nan: true))
       end
     end
 
@@ -411,7 +411,10 @@ module OpenC3
           latest_packet_name = packet_name
         end
       end
-      raise "Item '#{target_name} LATEST #{item_name}' does not exist for scope: #{scope}" if latest == -1
+      # Return the first packet name if no packets have been received
+      if latest == -1
+        latest_packet_name = packet_names[0]
+      end
       return latest_packet_name
     end
 
@@ -453,7 +456,7 @@ module OpenC3
       end
       override_data = Store.hget("#{scope}__override__#{target_name}", packet_name)
       if override_data
-        hash = JSON.parse(override_data, :allow_nan => true, :create_additions => true)
+        hash = JSON.parse(override_data, allow_nan: true, create_additions: true)
         overrides[tgt_pkt_key] = hash
       else
         hash = {}

data/lib/openc3/models/interface_model.rb

@@ -14,7 +14,7 @@
 # GNU Affero General Public License for more details.
 
 # Modified by OpenC3, Inc.
-# All changes Copyright 2023, OpenC3, Inc.
+# All changes Copyright 2025, OpenC3, Inc.
 # All Rights Reserved
 #
 # This file may also be used under the terms of a commercial license
@@ -33,6 +33,8 @@ module OpenC3
     attr_accessor :target_names # Redundant superset of cmd_target_names and tlm_target_names for backwards compat
     attr_accessor :cmd_target_names
     attr_accessor :tlm_target_names
+    attr_accessor :cmd_target_enabled
+    attr_accessor :tlm_target_enabled
     attr_accessor :connect_on_startup
     attr_accessor :auto_reconnect
     attr_accessor :reconnect_delay
@@ -104,6 +106,8 @@ module OpenC3
       target_names: [],
       cmd_target_names: [],
       tlm_target_names: [],
+      cmd_target_enabled: nil,
+      tlm_target_enabled: nil,
       connect_on_startup: true,
       auto_reconnect: true,
       reconnect_delay: 5.0,
@@ -134,6 +138,22 @@ module OpenC3
       @target_names = target_names
       @cmd_target_names = cmd_target_names
       @tlm_target_names = tlm_target_names
+      @cmd_target_enabled = cmd_target_enabled
+      if @cmd_target_enabled.nil?
+        @cmd_target_enabled = {}
+        @cmd_target_names.each do |target_name|
+          @cmd_target_enabled[target_name] = true
+        end
+        @cmd_target_enabled['UNKNOWN'] = true
+      end
+      @tlm_target_enabled = tlm_target_enabled
+      if @tlm_target_enabled.nil?
+        @tlm_target_enabled = {}
+        @tlm_target_names.each do |target_name|
+          @tlm_target_enabled[target_name] = true
+        end
+        @tlm_target_enabled['UNKNOWN'] = true
+      end
       @connect_on_startup = connect_on_startup
       @auto_reconnect = auto_reconnect
       @reconnect_delay = reconnect_delay
@@ -178,6 +198,8 @@ module OpenC3
       interface_or_router.target_names = @target_names.dup
       interface_or_router.cmd_target_names = @cmd_target_names.dup
       interface_or_router.tlm_target_names = @tlm_target_names.dup
+      interface_or_router.cmd_target_enabled = @cmd_target_enabled.dup
+      interface_or_router.tlm_target_enabled = @tlm_target_enabled.dup
       interface_or_router.connect_on_startup = @connect_on_startup
       interface_or_router.auto_reconnect = @auto_reconnect
       interface_or_router.reconnect_delay = @reconnect_delay
@@ -208,6 +230,8 @@ module OpenC3
         'target_names' => @target_names,
         'cmd_target_names' => @cmd_target_names,
         'tlm_target_names' => @tlm_target_names,
+        'cmd_target_enabled' => @cmd_target_enabled,
+        'tlm_target_enabled' => @tlm_target_enabled,
         'connect_on_startup' => @connect_on_startup,
         'auto_reconnect' => @auto_reconnect,
         'reconnect_delay' => @reconnect_delay,
@@ -236,27 +260,59 @@ module OpenC3
       target
     end
 
+    def handle_enabled(parser)
+      if parser.parameters[1].nil?
+        return true
+      else
+        enabled = parser.parameters[1].to_s.upcase
+        if enabled == 'ENABLED'
+          return true
+        elsif enabled == 'DISABLED'
+          return false
+        else
+          raise parser.error("MAP_TARGET enabled state must be ENABLED or DISABLED.", usage)
+        end
+      end
+    end
+
     # Handles Interface/Router specific configuration keywords
     def handle_config(parser, keyword, parameters)
       case keyword
       when 'MAP_TARGET'
-        parser.verify_num_parameters(1, 1, "#{keyword} <Target Name>")
+        usage = "#{keyword} <Target Name> <ENABLED/DISABLED>"
+        parser.verify_num_parameters(1, 2, usage)
         target_name = parameters[0].upcase
-        @target_names << target_name unless @target_names.include?(target_name)
-        @cmd_target_names << target_name unless @cmd_target_names.include?(target_name)
-        @tlm_target_names << target_name unless @tlm_target_names.include?(target_name)
+        enabled = handle_enabled(parser)
+
+        if target_name != 'UNKNOWN'
+          @target_names << target_name unless @target_names.include?(target_name)
+          @cmd_target_names << target_name unless @cmd_target_names.include?(target_name)
+          @tlm_target_names << target_name unless @tlm_target_names.include?(target_name)
+        end
+        @cmd_target_enabled[target_name] = enabled
+        @tlm_target_enabled[target_name] = enabled
 
       when 'MAP_CMD_TARGET'
-        parser.verify_num_parameters(1, 1, "#{keyword} <Target Name>")
+        parser.verify_num_parameters(1, 2, "#{keyword} <Target Name> <ENABLED/DISABLED>")
         target_name = parameters[0].upcase
-        @target_names << target_name unless @target_names.include?(target_name)
-        @cmd_target_names << target_name unless @cmd_target_names.include?(target_name)
+        enabled = handle_enabled(parser)
+
+        if target_name != 'UNKNOWN'
+          @target_names << target_name unless @target_names.include?(target_name)
+          @cmd_target_names << target_name unless @cmd_target_names.include?(target_name)
+        end
+        @cmd_target_enabled[target_name] = enabled
 
       when 'MAP_TLM_TARGET'
-        parser.verify_num_parameters(1, 1, "#{keyword} <Target Name>")
+        parser.verify_num_parameters(1, 2, "#{keyword} <Target Name> <ENABLED/DISABLED>")
         target_name = parameters[0].upcase
-        @target_names << target_name unless @target_names.include?(target_name)
-        @tlm_target_names << target_name unless @tlm_target_names.include?(target_name)
+        enabled = handle_enabled(parser)
+
+        if target_name != 'UNKNOWN'
+          @target_names << target_name unless @target_names.include?(target_name)
+          @tlm_target_names << target_name unless @tlm_target_names.include?(target_name)
+        end
+        @tlm_target_enabled[target_name] = enabled
 
       when 'DONT_CONNECT'
         parser.verify_num_parameters(0, 0, "#{keyword}")
@@ -434,7 +490,7 @@ module OpenC3
       microservice.update
     end
 
-    def map_target(target_name, cmd_only: false, tlm_only: false, unmap_old: true)
+    def map_target(target_name, cmd_only: false, tlm_only: false, unmap_old: true, cmd_enabled: true, tlm_enabled: true)
       if cmd_only and tlm_only
         cmd_only = false
         tlm_only = false
@@ -458,6 +514,8 @@ module OpenC3
       @target_names << target_name unless @target_names.include?(target_name)
       @cmd_target_names << target_name unless @cmd_target_names.include?(target_name) or tlm_only
       @tlm_target_names << target_name unless @tlm_target_names.include?(target_name) or cmd_only
+      @cmd_target_enabled[target_name] = cmd_enabled if not cmd_enabled.nil? and @cmd_target_names.include?(target_name)
+      @tlm_target_enabled[target_name] = tlm_enabled if not tlm_enabled.nil? and @tlm_target_names.include?(target_name)
       update()
 
       # Respawn the microservice

data/lib/openc3/models/metadata_model.rb

@@ -37,7 +37,7 @@ module OpenC3
       json = {'type' => METADATA_TYPE, 'start' => start}
       json['stop'] = stop if stop
       notification = {
-        'data' => JSON.generate(json),
+        'data' => JSON.generate(json, allow_nan: true),
         'kind' => kind,
         'type' => 'calendar',
       }
@@ -118,7 +118,7 @@ module OpenC3
       validate(update: update)
       @updated_at = Time.now.to_nsec_from_epoch
       MetadataModel.destroy(scope: @scope, start: update) if update
-      Store.zadd(@primary_key, @start, JSON.generate(as_json(:allow_nan => true)))
+      Store.zadd(@primary_key, @start, JSON.generate(as_json, allow_nan: true))
       if update
         notify(kind: 'updated')
       else

data/lib/openc3/models/microservice_status_model.rb

@@ -67,8 +67,8 @@ module OpenC3
         'name' => @name,
         'state' => @state,
         'count' => @count,
-        'error' => @error.as_json(:allow_nan => true),
-        'custom' => @custom.as_json(:allow_nan => true),
+        'error' => @error.as_json(),
+        'custom' => @custom.as_json(),
         'plugin' => @plugin,
         'updated_at' => @updated_at
       }

data/lib/openc3/models/model.rb

@@ -46,7 +46,7 @@ module OpenC3
     def self.get(primary_key, name:)
       json = store.hget(primary_key, name)
       if json
-        return JSON.parse(json, :allow_nan => true, :create_additions => true)
+        return JSON.parse(json, allow_nan: true, create_additions: true)
       else
         return nil
       end
@@ -61,7 +61,7 @@ module OpenC3
     def self.all(primary_key)
       hash = store.hgetall(primary_key)
       hash.each do |key, value|
-        hash[key] = JSON.parse(value, :allow_nan => true, :create_additions => true)
+        hash[key] = JSON.parse(value, allow_nan: true, create_additions: true)
       end
       hash
     end
@@ -88,7 +88,7 @@ module OpenC3
 
     # @return [Model] Model generated from the passed JSON
     def self.from_json(json, scope:)
-      json = JSON.parse(json, :allow_nan => true, :create_additions => true) if String === json
+      json = JSON.parse(json, allow_nan: true, create_additions: true) if String === json
       raise "json data is nil" if json.nil?
       json[:scope] = scope
       self.new(**json.transform_keys(&:to_sym), scope: scope)
@@ -159,7 +159,7 @@ module OpenC3
       else
         write_store = self.class.store
       end
-      write_store.hset(@primary_key, @name, JSON.generate(self.as_json(:allow_nan => true), :allow_nan => true))
+      write_store.hset(@primary_key, @name, JSON.generate(self.as_json(), allow_nan: true))
     end
 
     # Alias for create(update: true)

data/lib/openc3/models/note_model.rb

@@ -37,7 +37,7 @@ module OpenC3
       json = {'type' => NOTE_TYPE, 'start' => start}
       json['stop'] = stop if stop
       notification = {
-        'data' => JSON.generate(json),
+        'data' => JSON.generate(json, allow_nan: true),
         'kind' => kind,
         'type' => 'calendar',
       }
@@ -101,7 +101,7 @@ module OpenC3
       validate(update: update)
       @updated_at = Time.now.to_nsec_from_epoch
       NoteModel.destroy(scope: @scope, start: update) if update
-      Store.zadd(@primary_key, @start, JSON.generate(as_json(:allow_nan => true)))
+      Store.zadd(@primary_key, @start, JSON.generate(as_json, allow_nan: true))
       if update
         notify(kind: 'updated')
       else

data/lib/openc3/models/plugin_model.rb

@@ -133,7 +133,7 @@ module OpenC3
 
         store_id = Integer(store_id) if store_id
         model = PluginModel.new(name: gem_name, variables: variables, plugin_txt_lines: plugin_txt_lines, store_id: store_id, scope: scope)
-        result = model.as_json(:allow_nan => true)
+        result = model.as_json()
         result['existing_plugin_txt_lines'] = existing_plugin_txt_lines if existing_plugin_txt_lines and not process_existing and existing_plugin_txt_lines != result['plugin_txt_lines']
         return result
       ensure
@@ -293,7 +293,7 @@ module OpenC3
         FileUtils.remove_entry_secure(temp_dir, true)
         tf.unlink if tf
       end
-      return plugin_model.as_json(:allow_nan => true)
+      return plugin_model.as_json()
     end
 
     def initialize(
@@ -313,7 +313,12 @@ module OpenC3
     end
 
     def create(update: false, force: false, queued: false)
-      @name = @name + "__#{Time.now.utc.strftime("%Y%m%d%H%M%S")}" if not update and not @name.index("__")
+      if not update and not @name.index("__")
+        existing_names = Set.new(self.class.names(scope: @scope))
+        counter = 0
+        counter += 1 while existing_names.include?("#{@name}__#{counter}")
+        @name = "#{@name}__#{counter}"
+      end
       super(update: update, force: force, queued: queued)
     end
 
@@ -389,7 +394,7 @@ module OpenC3
 
     # Reinstall
     def restore
-      plugin_hash = self.as_json(:allow_nan => true)
+      plugin_hash = self.as_json()
       OpenC3::PluginModel.install_phase2(plugin_hash, scope: @scope)
       @destroyed = false
     end

data/lib/openc3/models/queue_model.rb

@@ -98,7 +98,7 @@ module OpenC3
     def notify(kind:)
       notification = {
         'kind' => kind,
-        'data' => JSON.generate(as_json(:allow_nan => true)),
+        'data' => JSON.generate(as_json, allow_nan: true),
       }
       QueueTopic.write_notification(notification, scope: @scope)
     end

data/lib/openc3/models/reaction_model.rb

@@ -206,14 +206,14 @@ module OpenC3
       end
       verify_triggers()
       @updated_at = Time.now.to_nsec_from_epoch
-      Store.hset(@primary_key, @name, JSON.generate(as_json(:allow_nan => true)))
+      Store.hset(@primary_key, @name, JSON.generate(as_json, allow_nan: true))
       notify(kind: 'created')
     end
 
     def update
       verify_triggers()
       @updated_at = Time.now.to_nsec_from_epoch
-      Store.hset(@primary_key, @name, JSON.generate(as_json(:allow_nan => true)))
+      Store.hset(@primary_key, @name, JSON.generate(as_json, allow_nan: true))
       # No notification as this is only called via reaction_controller which already notifies
     end
 
@@ -241,7 +241,7 @@ module OpenC3
       if @snooze > 0
         @snoozed_until = Time.now.to_i + @snooze
         @updated_at = Time.now.to_nsec_from_epoch
-        Store.hset(@primary_key, @name, JSON.generate(as_json(:allow_nan => true)))
+        Store.hset(@primary_key, @name, JSON.generate(as_json, allow_nan: true))
         notify(kind: 'snoozed')
       end
     end
@@ -249,7 +249,7 @@ module OpenC3
     def awaken
       @snoozed_until = nil
       @updated_at = Time.now.to_nsec_from_epoch
-      Store.hset(@primary_key, @name, JSON.generate(as_json(:allow_nan => true)))
+      Store.hset(@primary_key, @name, JSON.generate(as_json, allow_nan: true))
       notify(kind: 'awakened')
     end
 
@@ -272,7 +272,7 @@ module OpenC3
 
     # @return [ReactionModel] Model generated from the passed JSON
     def self.from_json(json, name:, scope:)
-      json = JSON.parse(json, :allow_nan => true, :create_additions => true) if String === json
+      json = JSON.parse(json, allow_nan: true, create_additions: true) if String === json
       raise "json data is nil" if json.nil?
       self.new(**json.transform_keys(&:to_sym), name: name, scope: scope)
     end
@@ -282,7 +282,7 @@ module OpenC3
       notification = {
         'kind' => kind,
         'type' => 'reaction',
-        'data' => JSON.generate(as_json(:allow_nan => true)),
+        'data' => JSON.generate(as_json, allow_nan: true),
       }
       AutonomicTopic.write_notification(notification, scope: @scope)
     end

data/lib/openc3/models/script_engine_model.rb

@@ -45,7 +45,7 @@ module OpenC3
     def self.all(scope: nil)
       tools = Store.hgetall(PRIMARY_KEY)
       tools.each do |key, value|
-        tools[key] = JSON.parse(value, :allow_nan => true, :create_additions => true)
+        tools[key] = JSON.parse(value, allow_nan: true, create_additions: true)
       end
       return tools
     end