legion-transport 1.1.4 → 1.2.0

data/lib/legion/transport/exchanges/crypt.rb

@@ -1,7 +1,7 @@
 module Legion
   module Transport
     module Exchanges
-      class Lex < Legion::Transport::Exchange
+      class Crypt < Legion::Transport::Exchange
         def exchange_name
           'crypt'
         end

data/lib/legion/transport/exchanges/extensions.rb

@@ -0,0 +1,11 @@
+module Legion
+  module Transport
+    module Exchanges
+      class Extensions < Legion::Transport::Exchange
+        def exchange_name
+          'extensions'
+        end
+      end
+    end
+  end
+end

data/lib/legion/transport/exchanges/lex.rb

@@ -1,10 +1,7 @@
 module Legion
   module Transport
     module Exchanges
-      class Lex < Legion::Transport::Exchange
-        def exchange_name
-          'lex'
-        end
+      class Lex < Legion::Transport::Exchanges::Extensions
       end
     end
   end

data/lib/legion/transport/message.rb

@@ -8,12 +8,10 @@ module Legion
         validate
       end
 
-      def publish(options = @options) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
+      def publish(options = @options) # rubocop:disable Metrics/AbcSize
         raise unless @valid
 
-        $exchanges = {} if $exchanges.nil?
-        $exchanges[exchange.to_s] = exchange.new unless $exchanges.key?(exchange.to_s)
-        exchange_dest = $exchanges[exchange.to_s]
+        exchange_dest = exchange.respond_to?(:new) ? exchange.new : exchange
         exchange_dest.publish(encode_message,
                               routing_key: routing_key || '',
                               content_type: options[:content_type] || content_type,
@@ -21,7 +19,48 @@ module Legion
                               type: options[:type] || type,
                               priority: options[:priority] || priority,
                               expiration: options[:expiration] || expiration,
-                              headers: headers)
+                              headers: headers,
+                              persistent: persistent,
+                              message_id: message_id,
+                              timestamp: timestamp)
+      end
+
+      def app_id
+        @options[:app_id] if @options.key? :app_id
+
+        'legion'
+      end
+
+      def message_id
+        @options[:message_id] || @options[:task_id]
+      end
+
+      # user_id Sender's identifier. https://www.rabbitmq.com/extensions.html#validated-user-id
+      def user_id
+        @options[:user_id] || Legion::Transport.settings[:connection][:user]
+      end
+
+      def reply_to
+        @options[:reply_to]
+      end
+
+      # ID of the message that this message is a reply to
+      def correlation_id
+        nil
+      end
+
+      def persistent
+        @options[:persistent] || Legion::Transport.settings[:messages][:persistent]
+      end
+
+      def expiration
+        if @options.key? :expiration
+          @options[:expiration]
+        elsif @options.key? :ttl
+          @options[:ttl]
+        elsif Legion::Transport.settings[:messages].key? :expiration
+          Legion::Transport.settings[:messages][:expiration]
+        end
       end
 
       def message
@@ -29,7 +68,7 @@ module Legion
       end
 
       def routing_key
-        nil
+        @options[:routing_key] if @options.key? :routing_key
       end
 
       def encode_message
@@ -66,7 +105,7 @@ module Legion
       end
 
       def headers
-        @options[:headers] ||= {}
+        @options[:headers] ||= Concurrent::Hash.new
         %i[task_id relationship_id trigger_namespace_id trigger_function_id parent_id master_id runner_namespace runner_class namespace_id function_id function chain_id debug].each do |header| # rubocop:disable Layout/LineLength
           next unless @options.key? header
 
@@ -74,18 +113,14 @@ module Legion
         end
         @options[:headers]
       rescue StandardError => e
-        Legion::Logging.error e.message
-        Legion::Logging.error e.backtrace
+        Legion::Transport.logger.error e.message
+        Legion::Transport.logger.error e.backtrace
       end
 
       def priority
         0
       end
 
-      def expiration
-        nil
-      end
-
       def content_type
         'application/json'
       end
@@ -99,12 +134,16 @@ module Legion
       end
 
       def timestamp
-        now.to_i
+        Time.now.to_i
       end
 
       def validate
         @valid = true
       end
+
+      def channel
+        Legion::Transport::Connection.channel
+      end
     end
   end
 end

data/lib/legion/transport/messages/dynamic.rb

@@ -7,7 +7,8 @@ module Legion::Transport::Messages # rubocop:disable Style/ClassAndModuleChildre
     end
 
     def message
-      { args: @options[:args] || @options }
+      { args: @options[:args] || @options,
+        function: function.values[:name] }
     end
 
     def routing_key

data/lib/legion/transport/messages/{node_health.rb → extension.rb}

@@ -1,15 +1,15 @@
-require 'legion/transport/exchanges/lex'
+require 'legion/transport/exchanges/extensions'
 
 module Legion
   module Transport
     module Messages
-      class NodeHealth < Legion::Transport::Message
+      class LexRegister < Legion::Transport::Message
         def exchange
-          Legion::Transport::Exchanges::Node
+          Legion::Transport::Exchanges::Extensions
         end
 
         def routing_key
-          'health'
+          'extensions.register.'
         end
 
         def validate

data/lib/legion/transport/messages/lex_register.rb

@@ -1,15 +1,15 @@
-require 'legion/transport/exchanges/lex'
+require 'legion/transport/exchanges/extensions'
 
 module Legion
   module Transport
     module Messages
       class LexRegister < Legion::Transport::Message
         def exchange
-          Legion::Transport::Exchanges::Lex
+          Legion::Transport::Exchanges::Extensions
         end
 
         def routing_key
-          'lex.register.save'
+          'extension_manager.register.save'
         end
 
         def validate

data/lib/legion/transport/messages/subtask.rb

@@ -16,6 +16,17 @@ module Legion
           }
         end
 
+        def routing_key # rubocop:disable Metrics/AbcSize
+          if @options[:conditions].is_a?(String) && @options[:conditions].length > 2
+            'task.subtask.conditioner'
+          elsif @options[:transformation].is_a?(String) && @options[:transformation].length > 2
+            'task.subtask.transform'
+          elsif @options[:function_id].is_a? Integer
+            function = Legion::Data::Model::Function[@options[:function_id]]
+            "#{function.runner.extension.values[:exchange]}.#{function.runner.values[:queue]}.#{function.values[:name]}"
+          end
+        end
+
         def validate
           raise TypeError unless @options[:function].is_a? String
 

data/lib/legion/transport/messages/task.rb

@@ -0,0 +1,41 @@
+module Legion
+  module Transport
+    module Messages
+      class Task < Legion::Transport::Message
+        def exchange
+          if @options.key?(:exchange) && @options[:exchange].is_a?(String)
+            Legion::Transport::Exchanges.new(@options[:exchange])
+          else
+            Legion::Transport::Exchanges::Task.new
+          end
+        end
+
+        def message
+          @options
+        end
+
+        def routing_key # rubocop:disable Metrics/AbcSize
+          if @options.key? :routing_key
+            @options[:routing_key]
+          elsif @options[:conditions].is_a?(String) && @options[:conditions].length > 2
+            'task.subtask.conditioner'
+          elsif @options[:transformation].is_a?(String) && @options[:transformation].length > 2
+            'task.subtask.transform'
+          elsif @options[:queue].is_a?(String) && @options[:function].is_a?(String)
+            "#{@options[:queue]}.#{@options[:function]}"
+          elsif @options[:queue].is_a?(String) && @options[:function_name].is_a?(String)
+            "#{@options[:queue]}.#{@options[:function_name]}"
+          elsif @options[:queue].is_a?(String) && @options[:name].is_a?(String)
+            "#{@options[:queue]}.#{@options[:name]}"
+          end
+        end
+
+        def validate
+          raise TypeError unless @options[:function].is_a? String
+
+          @valid = true
+        end
+      end
+    end
+  end
+end

data/lib/legion/transport/messages/task_update.rb

@@ -2,8 +2,13 @@ require 'legion/transport/exchanges/task'
 
 module Legion
   module Exception
-    class InvalidTaskStatus; end
-    class InvalidTaskId; end
+    class InvalidTaskStatus < ArgumentError
+      # exception class
+    end
+
+    class InvalidTaskId < ArgumentError
+      # exception class
+    end
   end
 end
 

data/lib/legion/transport/queue.rb

@@ -9,18 +9,18 @@ module Legion
         super(channel, queue, options_builder(default_options, queue_options, options))
       rescue Legion::Transport::CONNECTOR::PreconditionFailed
         retries.zero? ? retries = 1 : raise
-        recreate_queue(channel, queue)
+        recreate_queue(queue)
         retry
       end
 
-      def recreate_queue(channel, queue)
-        Legion::Logging.warn "Queue:#{queue} exists with wrong parameters, deleting and creating"
-        queue = ::Bunny::Queue.new(channel, queue, no_declare: true, passive: true)
+      def recreate_queue(queue)
+        Legion::Transport.logger.warn "Queue:#{queue} exists with wrong parameters, deleting and creating"
+        queue = ::Bunny::Queue.new(Legion::Transport::Connection.channel, queue, no_declare: true, passive: true)
         queue.delete(if_empty: true)
       end
 
       def default_options
-        hash = {}
+        hash = Concurrent::Hash.new
         hash[:manual_ack] = true
         hash[:durable] = true
         hash[:exclusive] = false
@@ -35,7 +35,7 @@ module Legion
       end
 
       def queue_options
-        {}
+        Concurrent::Hash.new
       end
 
       def queue_name

data/lib/legion/transport/settings.rb

@@ -3,62 +3,86 @@ require 'legion/settings'
 module Legion
   module Transport
     module Settings
-      # Legion::Settings.merge_settings('transport', default) if Legion::Settings.method_defined? :merge_settings
       def self.connection
         {
           read_timeout: 1,
-          heartbeat: 1,
+          heartbeat: 30,
           automatically_recover: true,
           continuation_timeout: 4000,
           network_recovery_interval: 1,
           connection_timeout: 1,
-          user: 'guest',
-          password: 'guest',
-          host: '127.0.0.1',
-          port: '5672',
-          vhost: 'legion',
-          recovery_attempts: 0,
-          logger_level: 'info'
+          frame_max: 65_536,
+          user: ENV['transport.connection.user'] || 'guest',
+          password: ENV['transport.connection.password'] || 'guest',
+          host: ENV['transport.connection.host'] || '127.0.0.1',
+          port: ENV['transport.connection.port'] || '5672',
+          vhost: ENV['transport.connection.vhost'] || '/',
+          recovery_attempts: 100,
+          logger_level: ENV['transport.log_level'] || 'info',
+          connected: false
         }.merge(grab_vault_creds)
       end
 
       def self.grab_vault_creds
         return {} unless Legion::Settings[:crypt][:vault][:connected]
 
+        Legion::Transport.logger.info 'Attempting to grab RabbitMQ creds from vault'
         lease = Legion::Crypt.read('rabbitmq/creds/legion', type: nil)
-        Legion::Logging.debug 'successfully grabbed amqp username from Vault'
+        Legion::Transport.logger.debug 'successfully grabbed amqp username from Vault'
         { user: lease[:username], password: lease[:password] }
       rescue StandardError
+        Legion::Transport.logger.warn 'Error reading rabbitmq creds from vault'
         {}
       end
 
+      def self.channel
+        {
+          default_worker_pool_size: ENV['transport.channel.default_worker_pool_size'] || 1,
+          session_worker_pool_size: ENV['transport.channel.session_worker_pool_size'] || 8
+        }
+      end
+
+      def self.queues
+        {
+          manual_ack: true,
+          durable: true,
+          exclusive: false,
+          block: false,
+          auto_delete: false,
+          arguments: { 'x-max-priority': 255, 'x-overflow': 'reject-publish' }
+        }
+      end
+
+      def self.exchanges
+        {
+          type: 'topic',
+          arguments: {},
+          auto_delete: false,
+          durable: true,
+          internal: false
+        }
+      end
+
+      def self.messages
+        {
+          encrypt: ENV['transport.messsages.encrypt'] == 'true',
+          ttl: ENV['transport.messages.ttl'],
+          priority: ENV['transport.messages.priority'].to_i || 0,
+          persistent: ENV['transport.messages.persistent'] == 'true'
+        }
+      end
+
       def self.default
         {
           type: 'rabbitmq',
           connected: false,
-          logger_level: 'info',
-          messages: {
-            encrypt: false,
-            ttl: nil,
-            priority: 0
-          },
-          exchanges: {
-            type: 'topic',
-            arguments: {},
-            auto_delete: false,
-            durable: true,
-            internal: false
-          },
-          queues: {
-            manual_ack: true,
-            durable: true,
-            exclusive: false,
-            block: false,
-            auto_delete: false,
-            arguments: { 'x-max-priority': 255, 'x-overflow': 'reject-publish' }
-          },
-          prefetch: 2,
-          connection: connection
+          logger_level: ENV['transport.logger_level'] || 'info',
+          messages: messages,
+          prefetch: ENV['transport.prefetch'].to_i || 2,
+          exchanges: exchanges,
+          queues: queues,
+          connection: connection,
+          channel: channel
         }
       end
     end
@@ -67,6 +91,6 @@ end
 
 begin
   Legion::Settings.merge_settings('transport', Legion::Transport::Settings.default) if Legion.const_defined?('Settings')
-rescue StandardError => e
-  Legion::Logging.fatal(e.message) if Legion::Logging.method_defined?(:fatal)
+rescue StandardError
+  Legion::Transport.logger.fatal(e.message)
 end