legionio 0.2.0 → 0.3.0

data/lib/legion/extensions/actors/base.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'hashdiff'
 
 module Legion
@@ -9,16 +7,14 @@ module Legion
         include Legion::Extensions::Helpers::Lex
 
         def runner
-          # runner_class:, function:, task_id: nil, args: nil, check_subtask: true, generate_task: true, parent_id: nil, master_id: nil, **opts
-          Legion::Runner.run(runner_class: runner_class, function: function, check_subtask: check_subtask, generate_task: generate_task)
+          Legion::Runner.run(runner_class: runner_class, function: function, check_subtask: check_subtask?, generate_task: generate_task?)
         rescue StandardError => e
           Legion::Logging.error e.message
           Legion::Logging.error e.backtrace
         end
 
         def manual
-          # Legion::Runner.run(runner_class: runner_class, function: runner_function, check_subtask: false, generate_task: false, args: args)
-          runner_class.send(runner_function, args)
+          runner_class.send(runner_function, **args)
         rescue StandardError => e
           Legion::Logging.error e.message
           Legion::Logging.error e.backtrace

data/lib/legion/extensions/actors/every.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require_relative 'base'
 
 module Legion

data/lib/legion/extensions/actors/loop.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require_relative 'base'
 
 module Legion

data/lib/legion/extensions/actors/once.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require_relative 'base'
 
 module Legion

data/lib/legion/extensions/actors/poll.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require_relative 'base'
 require 'hashdiff'
 require 'time'
@@ -51,7 +49,7 @@ module Legion
         end
 
         def cache_name
-          lex_name.to_s + '_' + runner_name
+          "#{lex_name}_#{runner_name}"
         end
 
         def int_percentage_normalize

data/lib/legion/extensions/actors/subscription.rb

@@ -1,6 +1,5 @@
-# frozen_string_literal: true
-
 require_relative 'base'
+require 'date'
 
 module Legion
   module Extensions
@@ -37,8 +36,12 @@ module Legion
         end
 
         def cancel
-          Legion::Logging.info "Closing subscription to #{@queue.name}"
+          return true unless @queue.channel.active
+
+          log.debug "Closing subscription to #{@queue.name}"
+          @consumer.cancel
           @queue.channel.close
+          true
         end
 
         def block
@@ -61,10 +64,9 @@ module Legion
           true
         end
 
-        def process_message(message, metadata)
+        def process_message(message, metadata, delivery_info)
           payload = if metadata[:content_encoding] && metadata[:content_encoding] == 'encrypted/cs'
-                      sleep(2) unless Legion::Settings[:crypt][:cs_encrypt_ready]
-                      Legion::Crypt.decrypt(message)
+                      Legion::Crypt.decrypt(message, metadata[:headers]['iv'])
                     elsif metadata[:content_encoding] && metadata[:content_encoding] == 'encrypted/pk'
                       Legion::Crypt.decrypt_from_keypair(metadata[:headers][:public_key], message)
                     else
@@ -74,10 +76,15 @@ module Legion
           message = if metadata[:content_type] == 'application/json'
                       Legion::JSON.load(payload)
                     else
-                      payload
+                      { value: payload }
                     end
+          if include_metadata_in_message?
+            message = message.merge(metadata[:headers].transform_keys(&:to_sym))
+            message[:routing_key] = delivery_info[:routing_key]
+          end
 
-          message = message.merge(metadata[:headers].transform_keys(&:to_sym)) if include_metadata_in_message?
+          message[:timestamp] = (message[:timestamp_in_ms] / 1000).round if message.key?(:timestamp_in_ms) && !message.key?(:timestamp)
+          message[:datetime] = Time.at(message[:timestamp].to_i).to_datetime.to_s if message.key?(:timestamp)
           message
         end
 
@@ -94,8 +101,9 @@ module Legion
           require 'legion/extensions/tasker/runners/updater'
           sleep(delay_start)
           consumer_tag = "#{Legion::Settings[:client][:name]}_#{lex_name}_#{runner_name}_#{Thread.current.object_id}"
-          @queue.subscribe(manual_ack: manual_ack, block: false, consumer_tag: consumer_tag) do |delivery_info, metadata, payload|
-            message = process_message(payload, metadata)
+          on_cancellation = block { cancel }
+          @consumer = @queue.subscribe(manual_ack: manual_ack, block: false, consumer_tag: consumer_tag, on_cancellation: on_cancellation) do |delivery_info, metadata, payload|
+            message = process_message(payload, metadata, delivery_info)
             if use_runner?
               Legion::Runner.run(**message,
                                  runner_class:  runner_class,
@@ -106,6 +114,8 @@ module Legion
               runner_class.send(find_function(message), **message)
             end
             @queue.acknowledge(delivery_info.delivery_tag) if manual_ack
+
+            cancel if Legion::Settings[:client][:shutting_down]
           rescue StandardError => e
             Legion::Logging.error e.message
             Legion::Logging.error e.backtrace

data/lib/legion/extensions/builders/actors.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require_relative 'base'
 
 module Legion
@@ -9,6 +7,7 @@ module Legion
         include Legion::Extensions::Builder::Base
 
         attr_reader :actors
+
         def build_actors
           @actors = {}
           require_files(actor_files)
@@ -19,7 +18,7 @@ module Legion
         def build_actor_list
           actor_files.each do |file|
             actor_name = file.split('/').last.sub('.rb', '')
-            actor_class = lex_class.to_s + '::Actor::' + actor_name.split('_').collect(&:capitalize).join
+            actor_class = "#{lex_class}::Actor::#{actor_name.split('_').collect(&:capitalize).join}"
             @actors[actor_name.to_sym] = {
               extension:      lex_class.to_s.downcase,
               extension_name: extension_name,
@@ -34,7 +33,7 @@ module Legion
           @runners.each do |runner, attr|
             next if @actors[runner.to_sym].is_a? Hash
 
-            actor_class = attr[:extension_class].to_s + '::Actor::' + runner.to_s.split('_').collect(&:capitalize).join
+            actor_class = "#{attr[:extension_class]}::Actor::#{runner.to_s.split('_').collect(&:capitalize).join}"
             build_meta_actor(runner, attr) unless Kernel.const_defined? actor_class
             @actors[runner.to_sym] = {
               extension:      attr[:extension],
@@ -49,7 +48,7 @@ module Legion
         def build_meta_actor(runner, attr)
           define_constant_two('Actor', root: lex_class)
 
-          Kernel.const_get(attr[:extension_class].to_s + '::Actor')
+          Kernel.const_get("#{attr[:extension_class]}::Actor")
                 .const_set(runner.to_s.split('_').collect(&:capitalize).join, Class.new(Legion::Extensions::Actors::Subscription))
         end
 

data/lib/legion/extensions/builders/base.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Legion
   module Extensions
     module Builder

data/lib/legion/extensions/builders/helpers.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require_relative 'base'
 
 module Legion

data/lib/legion/extensions/builders/runners.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require_relative 'base'
 
 module Legion
@@ -9,6 +7,7 @@ module Legion
         include Legion::Extensions::Builder::Base
 
         attr_reader :runners
+
         def build_runners
           @runners = {}
           lex_class.const_set('Runners', Module.new) unless lex_class.const_defined?('Runners')
@@ -19,7 +18,7 @@ module Legion
         def build_runner_list
           runner_files.each do |file|
             runner_name = file.split('/').last.sub('.rb', '')
-            runner_class = lex_class.to_s + '::Runners::' + runner_name.split('_').collect(&:capitalize).join
+            runner_class =  "#{lex_class}::Runners::#{runner_name.split('_').collect(&:capitalize).join}"
             loaded_runner = Kernel.const_get(runner_class)
             @runners[runner_name.to_sym] = {
               extension:       lex_class.to_s.downcase,

data/lib/legion/extensions/core.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require_relative 'builders/actors'
 require_relative 'builders/helpers'
 require_relative 'builders/runners'
@@ -45,11 +43,11 @@ module Legion
       end
 
       def build_transport
-        if File.exist? extension_path + '/transport/autobuild.rb'
+        if File.exist? "#{extension_path}/transport/autobuild.rb"
           require "#{extension_path}/transport/autobuild"
           extension_class::Transport::AutoBuild.build
           log.warn 'still using transport::autobuild, please upgrade'
-        elsif File.exist? extension_path + '/transport.rb'
+        elsif File.exist? "#{extension_path}/transport.rb"
           require "#{extension_path}/transport"
           extension_class::Transport.build
         else
@@ -58,7 +56,7 @@ module Legion
         end
       end
 
-      def build_settings
+      def build_settings # rubocop:disable Metrics/AbcSize
         if Legion::Settings[:extensions].key?(lex_name.to_sym)
           Legion::Settings[:default_extension_settings].each do |key, value|
             Legion::Settings[:extensions][lex_name.to_sym][key.to_sym] = if Legion::Settings[:extensions][lex_name.to_sym].key?(key.to_sym)
@@ -70,6 +68,18 @@ module Legion
         else
           Legion::Settings[:extensions][lex_name.to_sym] = Legion::Settings[:default_extension_settings]
         end
+
+        default_settings.each do |key, value|
+          Legion::Settings[:extensions][lex_name.to_sym][key.to_sym] = if Legion::Settings[:extensions][lex_name.to_sym].key?(key.to_sym)
+                                                                         value.merge(Legion::Settings[:extensions][lex_name.to_sym][key.to_sym])
+                                                                       else
+                                                                         value
+                                                                       end
+        end
+      end
+
+      def default_settings
+        {}
       end
 
       def auto_generate_transport

data/lib/legion/extensions/data.rb

@@ -0,0 +1,10 @@
+module Legion
+  module Extensions
+    module Data
+      def build
+        @models = []
+        @migrations = []
+      end
+    end
+  end
+end

data/lib/legion/extensions/helpers/base.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Legion
   module Extensions
     module Helpers
@@ -56,10 +54,6 @@ module Legion
         end
         alias extension_path full_path
 
-        def to_json(object)
-          Legion::JSON.dump(object)
-        end
-
         def from_json(string)
           Legion::JSON.load(string)
         end
@@ -76,7 +70,7 @@ module Legion
           hash.each_with_object({}) do |(k, v), ret|
             key = recursive_key + k.to_s
             if v.is_a? Hash
-              ret.merge! to_dotted_hash(v, key + '.')
+              ret.merge! to_dotted_hash(v, "#{key}.")
             else
               ret[key.to_sym] = v
             end

data/lib/legion/extensions/helpers/core.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require_relative 'base'
 module Legion
   module Extensions
@@ -11,8 +9,31 @@ module Legion
           if Legion::Settings[:extensions].key?(lex_filename.to_sym)
             Legion::Settings[:extensions][lex_filename.to_sym]
           else
-            { logger: { level: 'info', extended: false } }
+            { logger: { level: 'info', extended: false, internal: false } }
+          end
+        end
+
+        # looks local, then in crypt, then settings, then cache, then env
+        def find_setting(name, **opts)
+          log.debug ".find_setting(#{name}) called"
+          return opts[name.to_sym] if opts.key? name.to_sym
+
+          string_name = "#{lex_name}_#{name.to_s.downcase}"
+          if Legion::Settings[:crypt][:vault][:connected] && Legion::Crypt.exist?(lex_name)
+            log.debug "looking for #{string_name} in Legion::Crypt"
+            crypt_result = Legion::Crypt.get(lex_name)
+            return crypt_result[name.to_sym] if crypt_result.is_a?(Hash) && crypt_result.key?(name.to_sym)
+          end
+          return settings[name.to_sym] if settings.key? name.to_sym
+
+          if Legion::Settings[:cache][:connected]
+            log.debug "looking for #{string_name} in Legion::Cache"
+            cache_result = Legion::Cache.get(string_name)
+            return cache_result unless cache_result.nil?
           end
+
+          ENV[string_name] if ENV.key? string_name
+          nil
         end
       end
     end

data/lib/legion/extensions/helpers/lex.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Legion
   module Extensions
     module Helpers

data/lib/legion/extensions/helpers/logger.rb

@@ -1,10 +1,8 @@
-# frozen_string_literal: true
-
 module Legion
   module Extensions
     module Helpers
       module Logger
-        def log
+        def log # rubocop:disable Metrics/AbcSize
           return @log unless @log.nil?
 
           logger_hash = { lex: lex_filename || nil }
@@ -12,6 +10,7 @@ module Legion
           if respond_to?(:settings) && settings.key?(:logger)
             logger_hash[:level] = settings[:logger][:level] if settings[:logger].key? :level
             logger_hash[:level] = settings[:logger][:log_file] if settings[:logger].key? :log_file
+            logger_hash[:level] = 'info' unless settings[:logger].key? :log_file
             logger_hash[:trace] = settings[:logger][:trace] if settings[:logger].key? :trace
             logger_hash[:extended] = settings[:logger][:extended] if settings[:logger].key? :extended
           elsif respond_to?(:settings)
@@ -20,7 +19,7 @@ module Legion
           else
             Legion::Logging.warn 'no settings'
           end
-          @log = Legion::Logging::Logger.new(logger_hash)
+          @log = Legion::Logging::Logger.new(**logger_hash)
         end
 
         def handle_exception(exception, task_id: nil, **opts)

data/lib/legion/extensions/helpers/task.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'legion/transport'
 require 'legion/transport/messages/task_update'
 require 'legion/transport/messages/task_log'
@@ -19,7 +17,7 @@ module Legion
           %i[results payload function_args payload results].each do |column|
             update_hash[column] = opts[column] if opts.key? column
           end
-          Legion::Transport::Messages::TaskUpdate.new(update_hash).publish
+          Legion::Transport::Messages::TaskUpdate.new(**update_hash).publish
         rescue StandardError => e
           log.fatal e.message
           log.fatal e.backtrace

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

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require_relative 'base'
 
 module Legion

data/lib/legion/extensions/transport.rb

@@ -1,11 +1,10 @@
-# frozen_string_literal: true
-
 module Legion
   module Extensions
     module Transport
       include Legion::Extensions::Helpers::Transport
 
       attr_accessor :exchanges, :queues, :consumers, :messages
+
       def build
         @queues = []
         @exchanges = []
@@ -43,7 +42,7 @@ module Legion
         end
       end
 
-      def auto_create_exchange(exchange, default_exchange = false)
+      def auto_create_exchange(exchange, default_exchange = false) # rubocop:disable Style/OptionalBooleanParameter
         if Object.const_defined? exchange
           Legion::Logging.warn "#{exchange} is already defined"
           return
@@ -63,7 +62,7 @@ module Legion
           return
         end
 
-        Kernel.const_set(queue, Class.new(Legion::Transport::Queue))
+        transport_class::Queues.const_set(queue.split('::').last, Class.new(Legion::Transport::Queue))
       end
 
       def auto_create_dlx_exchange
@@ -82,7 +81,7 @@ module Legion
         return if transport_class::Queues.const_defined?('Dlx')
 
         special_name = default_exchange.new.exchange_name
-        dlx_queue = Legion::Transport::Queue.new "#{special_name}.dlx"
+        dlx_queue = Legion::Transport::Queue.new "#{special_name}.dlx", auto_delete: false
         dlx_queue.bind("#{special_name}.dlx", { routing_key: '#' })
       end
 

data/lib/legion/process.rb

@@ -1,9 +1,6 @@
-# frozen_string_literal: true
-
 require 'fileutils'
 
 module Legion
-  # Responsible for starting the Legion process
   class Process
     def self.run!(options)
       Legion::Process.new(options).run!
@@ -51,7 +48,7 @@ module Legion
       trap_signals
 
       until quit
-        sleep(1) # in real life, something productive would happen here
+        sleep(1)
         if @options.key? :time_limit
           @quit = true if Time.now - start_time > @options[:time_limit]
         end
@@ -113,16 +110,7 @@ module Legion
       :not_owned
     end
 
-    #==========================================================================
-    # SIGNAL HANDLING
-    #==========================================================================
-
     def trap_signals
-      # trap(:QUIT) do # graceful shutdown
-      #   info 'shutting down'
-      #   @quit = true
-      # end
-
       trap('SIGTERM') do
         info 'sigterm'
       end