From 3a417c069536b07a625c23634993ffcc6ba6b42b Mon Sep 17 00:00:00 2001
From: Matt Hooks <matt.hooks@dutchie.com>
Date: Thu, 23 Feb 2023 11:52:04 -0600
Subject: [PATCH 1/2] Use 'Content-Type' to access content type header

---
 lib/ld-eventsource/client.rb | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/ld-eventsource/client.rb b/lib/ld-eventsource/client.rb
index 7c14eb7..69e09f8 100644
--- a/lib/ld-eventsource/client.rb
+++ b/lib/ld-eventsource/client.rb
@@ -85,7 +85,7 @@ class Client
     #   if you want to use something other than the default `TCPSocket`; it must implement
     #   `open(uri, timeout)` to return a connected `Socket`
     # @yieldparam [Client] client  the new client instance, before opening the connection
-    # 
+    #
     def initialize(uri,
           headers: {},
           connect_timeout: DEFAULT_CONNECT_TIMEOUT,
@@ -107,7 +107,7 @@ def initialize(uri,
       if socket_factory
         http_client_options["socket_class"] = socket_factory
       end
-      
+
       if proxy
         @proxy = proxy
       else
@@ -202,12 +202,12 @@ def closed?
     end
 
     private
-    
+
     def reset_http
       @http_client.close if !@http_client.nil?
       close_connection
     end
-    
+
     def close_connection
       @lock.synchronize do
         @cxn.connection.close if !@cxn.nil?
@@ -258,7 +258,7 @@ def connect
         interval = @first_attempt ? 0 : @backoff.next_interval
         @first_attempt = false
         if interval > 0
-          @logger.info { "Will retry connection after #{'%.3f' % interval} seconds" } 
+          @logger.info { "Will retry connection after #{'%.3f' % interval} seconds" }
           sleep(interval)
         end
         cxn = nil
@@ -268,14 +268,14 @@ def connect
             headers: build_headers
           })
           if cxn.status.code == 200
-            content_type = cxn.headers["content-type"]
+            content_type = cxn.headers["Content-Type"]
             if content_type && content_type.start_with?("text/event-stream")
               return cxn  # we're good to proceed
             else
               reset_http
-              err = Errors::HTTPContentTypeError.new(cxn.headers["content-type"])
+              err = Errors::HTTPContentTypeError.new(content_type)
               @on[:error].call(err)
-              @logger.warn { "Event source returned unexpected content type '#{cxn.headers["content-type"]}'" }
+              @logger.warn { "Event source returned unexpected content type '#{content_type}'" }
             end
           else
             body = cxn.to_s  # grab the whole response body in case it has error details
@@ -309,7 +309,7 @@ def read_stream(cxn)
               # readpartial gives us a string, which may not be a valid UTF-8 string because a
               # multi-byte character might not yet have been fully read, but BufferedLineReader
               # will handle that.
-            rescue HTTP::TimeoutError 
+            rescue HTTP::TimeoutError
               # For historical reasons, we rethrow this as our own type
               raise Errors::ReadTimeoutError.new(@read_timeout)
             end
@@ -344,7 +344,7 @@ def log_and_dispatch_error(e, message)
       @logger.warn { "#{message}: #{e.inspect}"}
       @logger.debug { "Exception trace: #{e.backtrace}" }
       begin
-        @on[:error].call(e)      
+        @on[:error].call(e)
       rescue StandardError => ee
         @logger.warn { "Error handler threw an exception: #{ee.inspect}"}
         @logger.debug { "Exception trace: #{ee.backtrace}" }

From bcccb71b6f863d8f639e01110428249c2caa2b14 Mon Sep 17 00:00:00 2001
From: Matt Hooks <matt.hooks@dutchie.com>
Date: Thu, 9 Mar 2023 14:08:45 -0600
Subject: [PATCH 2/2] Use instance method for content_type

---
 lib/ld-eventsource/client.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ld-eventsource/client.rb b/lib/ld-eventsource/client.rb
index 69e09f8..e677446 100644
--- a/lib/ld-eventsource/client.rb
+++ b/lib/ld-eventsource/client.rb
@@ -268,7 +268,7 @@ def connect
             headers: build_headers
           })
           if cxn.status.code == 200
-            content_type = cxn.headers["Content-Type"]
+            content_type = cxn.content_type.mime_type
             if content_type && content_type.start_with?("text/event-stream")
               return cxn  # we're good to proceed
             else