kafkr 0.13.0 → 0.018.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 669818b6d1e72c19fe96e0d9c37cd0688d83613c030beb9a603426a173b0c2b8
-  data.tar.gz: 1b79a859b6ba2e38635df3b98c800940673a7b96ff775674eb68c75c6e647658
+  metadata.gz: 1e7fd62a57849b5096b9cba1a6928ee2786a401084ca29af0bfdfb1fc2cab7c5
+  data.tar.gz: 6ca89348304182eeabb6c4518818ad804d6b1b4c429c52ba82905cbf431bbb12
 SHA512:
-  metadata.gz: d07a005786bbf2391568c8982fe48f06917036c3f9b054fce2b4930fe92b53204f3b3f912fa8421bc522a60be07aee700e7bddfffe2367fb2ad6eceacb3ed399
-  data.tar.gz: ccb59017f9945f40b01e1f6df350f780176e24d9e46196b4a17f8b2dbee94f934f90d1b4af2ae7ed18a7bedd682c993a8d29fcb535423f1d81f813a545edbdb6
+  metadata.gz: a2ec64c8b63a6b57860ad372ca2dc851dffca1955f7ffe0a1958aaa3a636e50f05fd581e5556761355c8515317c16f29b4d78c8d839c7c429976789d2fcfcb61
+  data.tar.gz: f10c003cecfacbcd05376832784430262bcdb26244efe5c345a22bdf30a75ca67b335e48bc1a6b6c72476619ab984c3b4d66a10b54562b5805940ee4e9974b9a

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

@@ -7,9 +7,9 @@ require "digest"
 # Accepting command line arguments for host and port
 host = ARGV[0] || "localhost"
 port = ARGV[1] || 4000
-timeout = ARGV[2] || 120
+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|
@@ -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

@@ -5,12 +5,12 @@ require "readline"
 host = ARGV[0] || "localhost"
 port = ARGV[1] || 4000
 
-puts "Running on host: #{host} and port: #{port}"
+kakf "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 +24,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

@@ -4,7 +4,6 @@ class WebHandler < Kafkr::Consumer::Handler
   end
 
   def handle(message)
-    puts message
     if message["sync"]
       reply to: message, payload: {test: "set"}
     end

data/lib/kafkr/consumer.rb

@@ -1,4 +1,4 @@
-require "socket"
+require "socket" 
 require "timeout"
 require "ostruct"
 require "fileutils"
@@ -19,8 +19,8 @@ module Kafkr
         FileUtils.mkdir_p "./.kafkr"
         @configuration ||= OpenStruct.new
         @configuration.host = ENV.fetch("KAFKR_HOST", "localhost")
-        @configuration.port = ENV.fetch("KAFKR_PORT", 2000)
-        @configuration.timeout = ENV.fetch("KAFKR_CONSUMER_TIMEOUT", 120) 
+        @configuration.port = ENV.fetch("KAFKR_PORT", 4000)
+        @configuration.timeout = ENV.fetch("KAFKR_CONSUMER_TIMEOUT", 300) 
         @configuration.suggest_handlers = false
         @configuration
       end
@@ -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")
@@ -124,7 +124,7 @@ module Kafkr
 
       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"
+          Kafkr.log "No handler for this message, you could use this one.\n\n"
 
           handler_class_string = <<~HANDLER_CLASS
             class #{name.capitalize}Handler < Kafkr::Consumer::Handler
@@ -133,14 +133,14 @@ module Kafkr
               end
 
               def handle(message)
-                puts message
+                Kafkr.log message
               end
             end
 
             # Save the file to ./handlers/#{name}_handler.rb
           HANDLER_CLASS
 
-          puts handler_class_string
+          Kafkr.log handler_class_string
         end
       end
     end
@@ -160,20 +160,17 @@ module Kafkr
             received_message = socket.gets
             raise LostConnection if received_message.nil?
             received_message = Kafkr::Encryptor.new.decrypt(received_message.chomp)
-            if valid_json?(received_message)
-              payload = yield JSON.parse(received_message), sync_uid if block_given?
-              return payload if payload
-            end
+            payload = yield received_message, sync_uid if block_given?
+            return payload
           end
         end
       rescue Timeout::Error, LostConnection, Errno::ECONNREFUSED
         attempt += 1
         wait_time = backoff_time(attempt)
-        puts "Attempt #{attempt}: Retrying in #{wait_time} seconds..."
         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
@@ -182,8 +179,9 @@ module Kafkr
     def listen
       attempt = 0
       loop do
-        listen_for("dummy", ->(msg) { puts "Listening..." }) do |message|
-          puts "Received message: #{message}"
+        listen_for("dummy", ->(msg) {  }) do |message|
+          Kafkr.log ">> #{message}"
+          dispatch_to_handlers(message)
         end
       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

@@ -27,7 +27,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
@@ -35,27 +35,28 @@ module Kafkr
         @broker.add_subscriber(client)
 
         Thread.new do
-          loop do
-            encrypted_message = client.gets
-            if encrypted_message.nil?
-              @broker.last_sent.delete(client)
-              client.close
-              @broker.subscribers.delete(client)
-              puts "Client connection closed. Removed from subscribers list."
-              break
-            else
-              decryptor = Kafkr::Encryptor.new
-              message = decryptor.decrypt(encrypted_message.chomp) # Decrypt the message here
-              uuid, message_content = extract_uuid(message)
-              if uuid && message_content
-                @broker.broadcast(message_content)
+
+          
+          begin
+
+            loop do
+              encrypted_message = client.gets
+              if encrypted_message.nil?
+                @broker.last_sent.delete(client)
+                client.close
+                @broker.subscribers.delete(client)
+                break
               else
-                puts "Received invalid message format: #{message}"
+                decryptor = Kafkr::Encryptor.new
+                message = decryptor.decrypt(encrypted_message.chomp) # Decrypt the message here
+                uuid, message_content = extract_uuid(message)
+                @broker.broadcast(message_content)
               end
-            end
-          rescue Errno::ECONNRESET
-            puts "Connection reset by client. Closing connection..."
-            client.close
+            rescue Errno::ECONNRESET
+              client.close
+            end 
+          rescue StandardError => exception
+            #TODO we need to find the place for a global exception handler
           end
         end
       end
@@ -71,9 +72,10 @@ module Kafkr
       # Check if message is valid JSON
       begin
         message = JSON.parse(message)
+        Kafkr.log ">> #{message}"
         return message["uuid"], message
       rescue JSON::ParserError => e
-        puts "Received invalid message format: #{message}"
+        Kafkr.log ">> #{message}"
         match_data = /^(\w{8}-\w{4}-\w{4}-\w{4}-\w{12}): (.+)$/.match(message)
         match_data ? [match_data[1], match_data[2]] : [nil, nil]
       end

data/lib/kafkr/message_broker.rb

@@ -13,20 +13,22 @@ module Kafkr
     end
 
     def broadcast(message)
-      Kafkr.log message
-
-      encrypted_message = Kafkr::Encryptor.new.encrypt(message)
-
+      encrypted_message = Kafkr::Encryptor.new.encrypt(message) 
       @subscribers.each do |subscriber|
         if !subscriber.closed?
-          subscriber.puts(encrypted_message)
+          subscriber.Kafkr.log(encrypted_message)
           @last_sent[subscriber] = encrypted_message
         end
       rescue Errno::EPIPE
         # Optionally, handle broken pipe error
       rescue IOError
-        @subscribers.delete(subscriber)
-        @last_sent.delete(subscriber)
+        begin
+           @subscribers.delete(subscriber)
+          @last_sent.delete(subscriber)
+        rescue
+          Kafkr.log "clean up subscribers"
+        end
+
       end
     end
   end

data/lib/kafkr/producer.rb

@@ -50,6 +50,8 @@ module Kafkr
     end
 
     def self.send_message(message)
+      return if message.nil? || message.empty?
+
       uuid = SecureRandom.uuid
       message_with_uuid = nil
 
@@ -73,13 +75,13 @@ module Kafkr
       begin
         socket = TCPSocket.new(@configuration.host, @configuration.port)
         send_queued_messages(socket)
-        socket.puts(encrypted_message_with_uuid)
+        socket.Kafkr.log(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
 
@@ -104,14 +106,14 @@ module Kafkr
     def self.send_queued_messages(socket)
       until @configuration.message_queue.empty?
         queued_message = @configuration.message_queue.shift
-        socket.puts(queued_message)
+        socket.Kafkr.log(queued_message)
       end
     end
 
     def self.save_queue_to_file
       @@file_mutex.synchronize do
         File.open(@configuration.queue_file, "w") do |file|
-          file.puts(@configuration.message_queue)
+          file.Kafkr.log(@configuration.message_queue)
         end
       end
     end

data/lib/kafkr/version.rb

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

data/lib/kafkr.rb

@@ -75,16 +75,7 @@ module Kafkr
 
     def write(message, unique_id = nil)
       begin
-        unique_id ||= SecureRandom.uuid
-      rescue => e
-        unique_id = "unknown"
-        @logger.error("Failed to generate UUID: #{e.message}")
-      end
-      formatted_message = "[#{unique_id}] #{message}"
-
-      begin
-        puts formatted_message if development?
-        logger.info(formatted_message)
+        logger.info(message)
       rescue IOError => e
         @logger.error("Failed to write log: #{e.message}")
       end

metadata

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