kafkr 0.11.0 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41bbdf52172942afa5cb0758bee83eeb452f74f3d61849841fe186e44ef323a5
-  data.tar.gz: fcf59de6aed2bc3644df69573091dbffeb9641f39bb5fbdece548de3cf509217
+  metadata.gz: fa40dd04299dd0592d9d917e32693c1a8cbd10d25cc9678cdca44413256a0de6
+  data.tar.gz: 815f89d3916c61802215e1441f4d54701a278e0715c8b66686302aa7c7334764
 SHA512:
-  metadata.gz: 1f249925d3d2de4ca159796d88628450b78fdb5d5c00c756891202d39f7d8e34b69f282613c819c2aecc734a7fc0fe0c414ea2471955c27dda394e9f27bca1d5
-  data.tar.gz: 8e004710cfffe4ead0df8ed181fa5f8d044ca4cb8690d6be92028473475a9b2fddea89f0c8f77fbf96ea8b3eeaa00886a8e7ec94eff338379c9797cfa8956bf7
+  metadata.gz: cb51cb0b42d11a6f701dae3ea46fd520c46cbd9c8af20e6040c1f577162eff484d8dd7d9c9a783de60fcfc1250650cbec2ab22aaa8ff6d2481dc5defc57d6714
+  data.tar.gz: 454bbcf8b06713fdac04cff7abcf0d57bbec78fc4b85747e61217d8594fc2cb445dac357c6bc89b6acb4ca047e874d6cfb86060b6cfb30ea7aee03fe68d0508a

data/exe/kafkr-consumer

@@ -7,7 +7,7 @@ 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}"
 
@@ -34,8 +34,8 @@ def list_registered_handlers
   end
 end
 
-def start_consumer(port, host)
-  puts "Starting consumer on port #{port}!"
+def start_consumer(port, host, timeout)
+  puts "Starting consumer on port #{port}! timeout: #{timeout}"
   $handlers_changed = false
 
   Kafkr::Consumer.configure do |config|
@@ -97,13 +97,13 @@ end
 
 file_checksums = {}
 monitoring_thread = Thread.new { monitor_handlers(file_checksums) }
-start_consumer(port, host)  # Pass the port here
+start_consumer(port, host,timeout)  # Pass the port here
 
 begin
   loop do
     if $restart_required
       stop_consumer
-      start_consumer(port, host)
+      start_consumer(port, host,timeout)
       $restart_required = false
     end
     sleep 1

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
@@ -160,16 +160,13 @@ 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
@@ -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/log.rb

@@ -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,10 +13,7 @@ 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)
@@ -25,8 +22,13 @@ module Kafkr
       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
+          puts "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
 

data/lib/kafkr/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Kafkr
-  VERSION = "0.11.0"
+  VERSION = "0.18.0"
 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.11.0
+  version: 0.18.0
 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