kafkr 0.5.6 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 916ae5ff763b93c94e0e76ff62bb7026eb82e40570033ba05574d6c88d414568
-  data.tar.gz: f00ba9eb63a20bbbeadd9c64845131517c3866160f4ef2b5f73bf90ebc17a5c5
+  metadata.gz: c15f14feed8ee398816eb4454850798f764f10cafdf12f27aca353ac2412fa1b
+  data.tar.gz: 77c4facf9f2290d087d2b5b40aa63714e0c01f5d0f4a33cce4c85349264dfe63
 SHA512:
-  metadata.gz: 9a22fddb509c7ffe907650bb5150bee4f7288c9b091af583c8668937b60bf1299059839a2b2d154ff0f11f22b2192f9495313c7d62a60abbdb6343f92148f12e
-  data.tar.gz: dc9afae5d45522f79422ae4b03b0fcb3cb5a64e4cfa7ff1a311aa827be662e7cf4698a87be115c748f66513000750b14072838c95378acdd269a591f9d2d5aa1
+  metadata.gz: 3e1089f1fbe70c98be8c9ec09fe9d9967c20594c120857fa486bde44bb3ab2ef32cb02df7ae485e383ac1d802243a9468019bf9e6bfd6e057ce57fe14e465e4a
+  data.tar.gz: e929ce1c00207dd3f63be0294f73d4b885a3786a0748e84650baedd3a01e22e9755de5acf85d111d8e0ea29ce0ba1d4e51906f5a5228c0b5b2acbb3de56857a8

data/exe/kafkr

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+require_relative "../lib/kafkr.rb"
+
 PORT = ENV["KAFKR_PORT"] || 4000
 
 begin
@@ -10,7 +12,7 @@ end
 
 begin
   server = Kafkr::Log.new(PORT.to_i)
-  puts "Log started on port #{PORT}!"
+  puts "Kafkr Log version #{Kafkr::VERSION} started on port #{PORT}!"
   server.start
 rescue => e
   puts "An error occurred: #{e.message}"

data/exe/kafkr-consumer

@@ -33,7 +33,7 @@ def list_registered_handlers
   end
 end
 
-def start_consumer(port,host)
+def start_consumer(port, host)
   puts "Starting consumer on port #{port}!"
   $handlers_changed = false
 
@@ -95,13 +95,13 @@ end
 
 file_checksums = {}
 monitoring_thread = Thread.new { monitor_handlers(file_checksums) }
-start_consumer(port,host)  # Pass the port here
+start_consumer(port, host)  # Pass the port here
 
 begin
   loop do
     if $restart_required
       stop_consumer
-      start_consumer(port,host)
+      start_consumer(port, host)
       $restart_required = false
     end
     sleep 1

data/exe/kafkr-producer

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-require 'readline'
+require "readline"
 
 # Parsing command line arguments for host and port
 host = ARGV[0] || "localhost"

data/lib/kafkr/consumer.rb

@@ -18,6 +18,7 @@ module Kafkr
       def configuration
         FileUtils.mkdir_p "./.kafkr"
         @configuration ||= OpenStruct.new
+        @configuration.suggest_handlers = false
         @configuration
       end
 
@@ -72,13 +73,12 @@ module Kafkr
       protected
 
       def reply to:, payload:
-        
         Kafkr::Producer.configure do |config|
           config.host = Consumer.configuration.host
           config.port = Consumer.configuration.port
         end
 
-        Kafkr::Producer.send_message({reply: {payload: payload, uuid: to['sync_uid']}},acknowledge: false)
+        Kafkr::Producer.send_message({reply: {payload: payload, uuid: to["sync_uid"]}}, acknowledge: false)
       end
 
       private
@@ -134,27 +134,29 @@ module Kafkr
         return
       end
 
-      if valid_class_name? name.capitalize
-        puts "No handler for this message, you could use this one."
-        puts ""
+      if Kafkr::Consumer.configuration.suggest_handlers
+        if valid_class_name? name.capitalize
+          puts "No handler for this message, you could use this one."
+          puts ""
 
-        handler_class_string = <<~HANDLER_CLASS
+          handler_class_string = <<~HANDLER_CLASS
 
-          class #{name.capitalize}Handler < Kafkr::Consumer::Handler
-            def handle?(message)
-              can_handle? message, '#{name}'
-            end
+            class #{name.capitalize}Handler < Kafkr::Consumer::Handler
+              def handle?(message)
+                can_handle? message, '#{name}'
+              end
       
-            def handle(message)
-              puts message
+              def handle(message)
+                puts message
+              end
             end
-          end
 
-          save the file to ./handlers/#{name}_handler.rb
+            save the file to ./handlers/#{name}_handler.rb
 
-        HANDLER_CLASS
+          HANDLER_CLASS
 
-        puts handler_class_string
+          puts handler_class_string
+        end
       end
     end
 
@@ -163,8 +165,7 @@ module Kafkr
     def listen_for(message, send_message)
       attempt = 0
       begin
-        socket = TCPSocket.new( Consumer.configuration.host,  Consumer.configuration.port)
-        puts "Connected to server. #{Consumer.configuration.host} #{Consumer.configuration.port} " if attempt == 0
+        socket = TCPSocket.new(Consumer.configuration.host, Consumer.configuration.port)
         attempt = 0
 
         Timeout.timeout(20) do
@@ -175,11 +176,11 @@ module Kafkr
             received_message = socket.gets
             raise LostConnection if received_message.nil?
             # Assuming Kafkr::Encryptor is defined elsewhere
-            received_message = Kafkr::Encryptor.new.decrypt(received_message.chomp)            
+            received_message = Kafkr::Encryptor.new.decrypt(received_message.chomp)
             # Yield every received message to the given block
             if valid_json?(received_message)
-               payload =yield JSON.parse(received_message),sync_uid if block_given?
-               return payload if payload
+              payload = yield JSON.parse(received_message), sync_uid if block_given?
+              return payload if payload
             end
           end
         end
@@ -206,8 +207,7 @@ module Kafkr
     def listen
       attempt = 0
       loop do
-        socket = TCPSocket.new(Consumer.configuration.host,  Consumer.configuration.port)
-        puts "Connected to server. #{Consumer.configuration.host} #{Consumer.configuration.port} " if attempt == 0
+        socket = TCPSocket.new(Consumer.configuration.host, Consumer.configuration.port)
         attempt = 0
 
         loop do

data/lib/kafkr/log.rb

@@ -74,7 +74,7 @@ module Kafkr
     end
 
     def load_whitelist
-      whitelist = ["localhost", "::1","127.0.0.1"]
+      whitelist = ["localhost", "::1", "127.0.0.1"]
       if File.exist?("whitelist.txt")
         File.readlines("whitelist.txt").each do |line|
           ip = line.strip.sub(/^::ffff:/, "")
@@ -91,8 +91,19 @@ module Kafkr
     private
 
     def extract_uuid(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]
+
+      #check if message if valid json
+      begin
+        message = JSON.parse(message)
+        
+        return message["uuid"], message
+
+      rescue JSON::ParserError => e
+        puts "Received invalid message format: #{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
+      
     end
 
     def acknowledge_message(uuid, client)

data/lib/kafkr/producer.rb

@@ -21,6 +21,7 @@ module Kafkr
       @configuration.acknowledged_messages = []
       @configuration.acknowledged_messages = load_acknowledged_messages
       load_queue_from_file
+      @configuration.is_json = false
       @configuration
     end
 
@@ -72,14 +73,22 @@ module Kafkr
 
     def self.send_message(message, acknowledge: true)
       uuid = SecureRandom.uuid
+    
+      message_with_uuid = nil
 
-      if message.is_a? String
-        message = structured_data_to_hash(input: message, sync_uid: uuid)
-        message_with_uuid = "#{uuid}: #{message}"
-      end
+      if Kafkr::Producer.configuration.is_json
+        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)}"
+        if message.is_a?(Hash)
+          message_with_uuid = "#{uuid}: #{JSON.generate(message)}"
+        end
       end
 
       # Encrypt the message here
@@ -116,17 +125,14 @@ module Kafkr
 
     def self.send_message_and_wait(message)
       # Using method(:send_message) to pass the send_message method as a callable object
-      
-      payload = Consumer.new.listen_for(message, self.method(:send_message)) do |received_message,sync_uid|
+
+      Consumer.new.listen_for(message, method(:send_message)) do |received_message, sync_uid|
         if received_message.key? "reply"
-          if received_message["reply"].dig('uuid') == sync_uid
-            received_message["reply"].dig('payload')
+          if received_message["reply"].dig("uuid") == sync_uid
+            received_message["reply"].dig("payload")
           end
         end
-
       end
-
-      payload
     end
 
     private

data/lib/kafkr/version.rb

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

data/lib/kafkr.rb

@@ -11,6 +11,7 @@ require_relative "kafkr/message_broker"
 require_relative "kafkr/log"
 require_relative "kafkr/consumer"
 require_relative "kafkr/producer"
+require_relative "kafkr/version"
 
 module Kafkr
   class << self

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kafkr
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.9.1
 platform: ruby
 authors:
 - Delaney Kuldvee Burke
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-01-19 00:00:00.000000000 Z
+date: 2024-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gibberish