kafkr 0.18.0 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa40dd04299dd0592d9d917e32693c1a8cbd10d25cc9678cdca44413256a0de6
-  data.tar.gz: 815f89d3916c61802215e1441f4d54701a278e0715c8b66686302aa7c7334764
+  metadata.gz: 27db175bfdb0bab5dec371a1abf78a0f54293ee6c883612f1fed4f7c48d55e01
+  data.tar.gz: d50374c0847f19ac9141bb6eff5d9dd968594c9c4380aecbdc6417dc54322b14
 SHA512:
-  metadata.gz: cb51cb0b42d11a6f701dae3ea46fd520c46cbd9c8af20e6040c1f577162eff484d8dd7d9c9a783de60fcfc1250650cbec2ab22aaa8ff6d2481dc5defc57d6714
-  data.tar.gz: 454bbcf8b06713fdac04cff7abcf0d57bbec78fc4b85747e61217d8594fc2cb445dac357c6bc89b6acb4ca047e874d6cfb86060b6cfb30ea7aee03fe68d0508a
+  metadata.gz: 050231b1632c5ead63874eee350807cb821584892e87d4dbfdad10d7f10281872ab32fa60f2089d39bf0cf9b26ab41514ad6451430445deca35b4013a85e55e7
+  data.tar.gz: 5cd9a1e0e8b5404120fd8d0aea97a421422b219b5470eda2c0e700db7386583283a3b794bc0a4a2bae96f117c2c39b9c581442113c269f567109e577b53ad973

data/exe/kafkr

@@ -6,19 +6,19 @@ PORT = ENV["KAFKR_PORT"] || 4000
 begin
   require "kafkr"
 rescue LoadError => e
-  puts "Failed to load Kafkr: #{e.message}"
+  Kafkr.log "Failed to load Kafkr: #{e.message}"
   exit(1)
 end
 
 begin
   server = Kafkr::Log.new(PORT.to_i)
-  puts "Kafkr Log version #{Kafkr::VERSION} started on port #{PORT}!"
+  Kafkr.log "Kafkr Log version #{Kafkr::VERSION} started on port #{PORT}!"
   server.start
 rescue => e
-  puts "An error occurred: #{e.message}"
+  Kafkr.log "An error occurred: #{e.message}"
   exit(1)
 rescue Interrupt
-  puts "\nLog server shutting down gracefully..."
+  Kafkr.log "\nLog server shutting down gracefully..."
   server.stop if server.respond_to?(:stop)
   exit(0)
 end

data/exe/kafkr-consumer

@@ -9,7 +9,7 @@ host = ARGV[0] || "localhost"
 port = ARGV[1] || 4000
 timeout = ARGV[2] || 300
 
-puts "Running on host: #{host} and port: #{port}"
+Kafkr.log "Running on host: #{host} and port: #{port}"
 
 $current_consumer = nil
 $restart_required = false
@@ -26,16 +26,15 @@ def stop_consumer
 end
 
 def list_registered_handlers
-  puts "Registered Handlers:"
   Kafkr::Consumer.handlers.each do |handler|
     $loaded_handlers = {}
     handler_name = handler.class.name.split("::").last.gsub(/Handler$/, "")
-    puts "#{handler_name} handler registered."
+    Kafkr.log "#{handler_name} handler registered."
   end
 end
 
 def start_consumer(port, host, timeout)
-  puts "Starting consumer on port #{port}! timeout: #{timeout}"
+  Kafkr.log "Starting consumer on port #{port}! timeout: #{timeout}"
   $handlers_changed = false
 
   Kafkr::Consumer.configure do |config|
@@ -52,7 +51,7 @@ def start_consumer(port, host, timeout)
 
   $current_consumer = Kafkr::Consumer.new
   $current_consumer.listen do |message|
-    # Processing of the message
+    Kafkr.log "Message consumed: #{message}"# Processing of the message
   end
 end
 
@@ -69,7 +68,7 @@ def reload_handlers(file_checksums)
     if new_handlers.any?
       new_handlers.each do |handler|
         handler_name = handler.class.name.split("::").last.gsub(/Handler$/, "").capitalize
-        puts "#{handler_name} handler updated - ok!"
+        Kafkr.log "#{handler_name} handler updated - ok!"
       end
     end
   end

data/exe/kafkr-keys

@@ -5,4 +5,4 @@ require "base64"
 key = OpenSSL::Random.random_bytes(32)
 encoded_key = Base64.encode64(key).chomp # .chomp to remove newline character from encoded key
 
-puts "keys: #{encoded_key}"
+Kafkr.log "keys: #{encoded_key}"

data/exe/kafkr-producer

@@ -1,16 +1,17 @@
 #!/usr/bin/env ruby
+require "kafkr"
 require "readline"
 
 # Parsing command line arguments for host and port
 host = ARGV[0] || "localhost"
 port = ARGV[1] || 4000
 
-puts "Running on host: #{host} and port: #{port}"
+Kafkr.log "Running on host: #{host} and port: #{port}"
 
 begin
   require "kafkr"
 rescue LoadError => e
-  puts "Failed to load Kafkr: #{e.message}"
+  Kafkr.log "Failed to load Kafkr: #{e.message}"
   exit(1)
 end
 
@@ -24,15 +25,15 @@ begin
     break if line == "exit"
 
     if line.include? "<=>"
-      puts Kafkr::Producer.send_message_and_wait(line)
+      Kafkr.log Kafkr::Producer.send_message_and_wait(line)
     else
       Kafkr::Producer.send_message(line)
     end
   end
 rescue => e
-  puts "An error occurred: #{e.message}"
+  Kafkr.log "An error occurred: #{e.message}"
   exit(1)
 rescue Interrupt
-  puts "\nProducer server shutting down gracefully..."
+  Kafkr.log "\nProducer server shutting down gracefully..."
   exit(0)
 end

data/handlers/web_handler.rb

@@ -1,10 +1,11 @@
+require "pry"
+
 class WebHandler < Kafkr::Consumer::Handler
   def handle?(message)
-    can_handle? message, "web"
+    message.include?("web")
   end
 
   def handle(message)
-    puts message
     if message["sync"]
       reply to: message, payload: {test: "set"}
     end

data/lib/kafkr/consumer.rb

@@ -37,8 +37,8 @@ module Kafkr
       $handlers_changed = true
 
       def list_registered_handlers
-        puts "Registered handlers:"
-        $loaded_handlers.keys.each { |handler| puts "- #{handler}" }
+        Kafkr.log "Registered handlers:"
+        $loaded_handlers.keys.each { |handler| Kafkr.log "- #{handler}" }
       end
 
       def load_handlers(directory = "./handlers")
@@ -77,23 +77,6 @@ module Kafkr
         Kafkr::Producer.send_message({reply: {payload: payload, uuid: to["sync_uid"]}})
       end
 
-      private
-
-      def can_handle?(message, name, ignore: :any)
-        if message.is_a?(Numeric)
-          return true if message == name.to_i
-        elsif ignore == :hash
-          return true if message[:message] && message[:message][:body] && message[:message][:body] == name
-          return true if message[:message] && message[:message][:body] && message[:message][:body].start_with?(name)
-        elsif ignore == :string
-          return true if message.key? name
-        else
-          return true if message.key? name
-          return true if message[:message] && message[:message][:body] && message[:message][:body] == name
-          return true if message[:message] && message[:message][:body] && message[:message][:body].start_with?(name)
-        end
-        false
-      end
     end
 
     def initialize(host = Consumer.configuration.host, port = Consumer.configuration.port)
@@ -113,40 +96,6 @@ module Kafkr
       /^[A-Z]\w*$/.match?(name)
     end
 
-    def print_handler_class(name)
-      return if name.is_a?(Numeric)
-      name = name.keys.first if name.is_a?(Hash)
-      handler_name = "#{name.downcase}_handler"
-
-      if $loaded_handlers.key?(handler_name)
-        return
-      end
-
-      if Kafkr::Consumer.configuration.suggest_handlers
-        if valid_class_name?(name.capitalize)
-          puts "No handler for this message, you could use this one.\n\n"
-
-          handler_class_string = <<~HANDLER_CLASS
-            class #{name.capitalize}Handler < Kafkr::Consumer::Handler
-              def handle?(message)
-                can_handle? message, '#{name}'
-              end
-
-              def handle(message)
-                puts message
-              end
-            end
-
-            # Save the file to ./handlers/#{name}_handler.rb
-          HANDLER_CLASS
-
-          puts handler_class_string
-        end
-      end
-    end
-
-    require "timeout"
-
     def listen_for(message, send_message)
       attempt = 0
       begin
@@ -170,7 +119,7 @@ module Kafkr
         sleep(wait_time)
         retry
       rescue Interrupt
-        puts "Received interrupt signal. Shutting down consumer gracefully..."
+        Kafkr.log "Received interrupt signal. Shutting down consumer gracefully..."
         socket&.close
         exit(0)
       end
@@ -202,7 +151,8 @@ module Kafkr
     private
 
     def dispatch_to_handlers(message)
-      message_hash = message.is_a?(String) ? {message: {body: message}} : message
+      
+      message_hash = JSON.parse(message)
 
       self.class.handlers.each do |handler|
         if handler.handle?(message_hash)
@@ -210,8 +160,6 @@ module Kafkr
         end
       end
 
-      print_handler_class(message)
-
       yield message_hash if block_given?
     end
   end

data/lib/kafkr/encryptor.rb

@@ -19,7 +19,7 @@ module Kafkr
     end
 
     def decrypt(encrypted_data)
-      # puts "Encrypted data before decoding: #{encrypted_data.inspect}"
+      # Kafkr.log "Encrypted data before decoding: #{encrypted_data.inspect}"
       decipher = OpenSSL::Cipher.new(ALGORITHM)
       decipher.decrypt
       decipher.key = @key
@@ -27,7 +27,7 @@ module Kafkr
       decipher.iv = raw_data[0, decipher.iv_len]
       decipher.update(raw_data[decipher.iv_len..-1]) + decipher.final
     rescue OpenSSL::Cipher::CipherError => e
-      puts "Decryption failed: #{e.message}"
+      Kafkr.log "Decryption failed: #{e.message}"
       nil
     end
   end

data/lib/kafkr/log.rb

@@ -1,5 +1,7 @@
 require "socket"
 require "rubygems"
+require "kafkr"
+
 
 module Kafkr
   class Log
@@ -27,7 +29,7 @@ module Kafkr
         client_ip = client.peeraddr[3]
 
         unless whitelisted?(client_ip)
-          puts "Connection from non-whitelisted IP: #{client_ip}. Ignored."
+          Kafkr.log "Connection from non-whitelisted IP: #{client_ip}. Ignored."
           client.close
           next
         end
@@ -50,13 +52,13 @@ module Kafkr
                 decryptor = Kafkr::Encryptor.new
                 message = decryptor.decrypt(encrypted_message.chomp) # Decrypt the message here
                 uuid, message_content = extract_uuid(message)
-                @broker.broadcast(message_content)
+                @broker.broadcast(JSON.dump(message_content))
               end
             rescue Errno::ECONNRESET
               client.close
             end 
           rescue StandardError => exception
-            #TODO we need to find the place for a global exception handler
+            Kafkr.log "Error: #{exception.message}"
           end
         end
       end

data/lib/kafkr/message_broker.rb

@@ -26,7 +26,7 @@ module Kafkr
            @subscribers.delete(subscriber)
           @last_sent.delete(subscriber)
         rescue
-          puts "clean up subscribers"
+          Kafkr.log "clean up subscribers"
         end
 
       end

data/lib/kafkr/producer.rb

@@ -17,7 +17,7 @@ module Kafkr
       @configuration.queue_file = MESSAGE_QUEUE
       @configuration.message_queue = []
       load_queue_from_file
-      @configuration.is_json = false
+      @configuration.is_json = true
       @configuration
     end
 
@@ -27,28 +27,6 @@ module Kafkr
       logger.error("Configuration error: #{e.message}")
     end
 
-    def self.structured_data_to_hash(input:, sync_uid:)
-      unless /\A\w+\s*(=>|<=>)\s*((\w+:\s*['"]?[^'",]*['"]?,\s*)*(\w+:\s*['"]?[^'",]*['"]?)\s*)\z/.match?(input)
-        return input
-      end
-
-      if input.include?("<=>")
-        type, key_values_str = input.split("<=>").map(&:strip)
-        key_values = key_values_str.scan(/(\w+):\s*['"]?([^'",]*)['"]?/)
-        hash_body = key_values.to_h do |key, value|
-          [key.to_sym, value.strip.gsub(/\A['"]|['"]\z/, "")]
-        end
-        {type.to_sym => hash_body, :sync => true, :sync_uid => sync_uid}
-      else
-        type, key_values_str = input.split("=>").map(&:strip)
-        key_values = key_values_str.scan(/(\w+):\s*['"]?([^'",]*)['"]?/)
-        hash_body = key_values.to_h do |key, value|
-          [key.to_sym, value.strip.gsub(/\A['"]|['"]\z/, "")]
-        end
-        {type.to_sym => hash_body}
-      end
-    end
-
     def self.send_message(message)
       return if message.nil? || message.empty?
 
@@ -59,15 +37,6 @@ module Kafkr
         json_message = JSON.parse(message)
         json_message["uuid"] = uuid
         message_with_uuid = JSON.dump(json_message)
-      else
-        if message.is_a? String
-          message = structured_data_to_hash(input: message, sync_uid: uuid)
-          message_with_uuid = "#{uuid}: #{message}"
-        end
-
-        if message.is_a?(Hash)
-          message_with_uuid = "#{uuid}: #{JSON.generate(message)}"
-        end
       end
 
       encrypted_message_with_uuid = Kafkr::Encryptor.new.encrypt(message_with_uuid)
@@ -75,13 +44,13 @@ module Kafkr
       begin
         socket = TCPSocket.new(@configuration.host, @configuration.port)
         send_queued_messages(socket)
-        socket.puts(encrypted_message_with_uuid)
+        socket.puts (encrypted_message_with_uuid)
       rescue Errno::ECONNREFUSED
-        puts "Connection refused. Queuing message: #{encrypted_message_with_uuid}"
+        Kafkr.log "Connection refused. Queuing message: #{encrypted_message_with_uuid}"
         @configuration.message_queue.push(encrypted_message_with_uuid)
         save_queue_to_file
       rescue Errno::EPIPE
-        puts "Broken pipe error. Retrying connection..."
+        Kafkr.log "Broken pipe error. Retrying connection..."
         retry_connection(encrypted_message_with_uuid)
       end
 
@@ -126,8 +95,5 @@ module Kafkr
       end
     end
 
-    def self.logger
-      @logger ||= Logger.new(STDOUT)
-    end
   end
 end

data/lib/kafkr/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Kafkr
-  VERSION = "0.18.0"
+  VERSION = "0.21.0"
 end

data/lib/kafkr.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-
+require "pry"
 require "logger"
 require "openssl"
 require "securerandom"
@@ -15,64 +15,21 @@ require_relative "kafkr/version"
 
 module Kafkr
   class << self
-    attr_accessor :current_environment
     def logger
       @logger ||= configure_logger
     end
 
-    def configure_logger(output = default_output)
+    def configure_logger(output = STDOUT)
       begin
         @logger = ::Logger.new(output)
       rescue Errno::EACCES, Errno::ENOENT => e
         @logger = ::Logger.new(STDOUT)
         @logger.error("Could not open log file: #{e.message}")
       end
-      set_logger_level
+      @logger.level = ::Logger::DEBUG
       @logger
     end
 
-    def default_output
-      case current_environment
-      when "production"
-        "/var/log/kafkr.log"
-      else
-        STDOUT
-      end
-    end
-
-    def set_logger_level
-      @logger.level = case current_environment
-      when "development"
-        ::Logger::DEBUG
-      when "staging"
-        ::Logger::INFO
-      when "production"
-        ::Logger::WARN
-      else
-        ::Logger::DEBUG
-      end
-    end
-
-    def current_environment
-      @current_environment ||= ENV["KAFKR_ENV"] || "development"
-    end
-
-    def development?
-      current_environment == "development"
-    end
-
-    def test?
-      current_environment == "test"
-    end
-
-    def staging?
-      current_environment == "staging"
-    end
-
-    def production?
-      current_environment == "production"
-    end
-
     def write(message, unique_id = nil)
       begin
         logger.info(message)
@@ -100,3 +57,4 @@ module Kafkr
     logger.error("Configuration error: #{e.message}")
   end
 end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kafkr
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.21.0
 platform: ruby
 authors:
 - Delaney Kuldvee Burke
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-04-10 00:00:00.000000000 Z
+date: 2024-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gibberish