ld-eventsource 2.2.0 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76ed80d3fefe60b6a147769dc1b44b0dfd7fe5b6841ff84655ae86764def70b9
-  data.tar.gz: cf24cff61716e4487d74023e09be18a516232a198aabcda2742fb8ec8de9de72
+  metadata.gz: 218cc36d5dda460be0004eb338d39d5ebeeeed75c5d12150bc8374c1fcc59ebf
+  data.tar.gz: f5da16ee1ae0277e069b6f94f5ff133dd119cb247196b810bf517fb3831a8118
 SHA512:
-  metadata.gz: 329c044114376d9d618e37a138b7c99dc5c4f00baa3d22ea72ce88309deec8bd22a62c0513a362223542f9ddfa5aaae0413e14bbf336ef943a90e0374d2d9c89
-  data.tar.gz: 9110b5daa08a3c7fb04bb432527feaf4bee5e67d02b215621c89546ffd0a4da98c14a9618cdf4040474afe1649db777996547bfb502512930a3b364f05dd57c1
+  metadata.gz: eee2596eb7bb33f476b969a03908a414705fbcc237afa246d2e6057933ac3ccb56aa4416f810ead64cc1b1ff33bcc326798a2d703cc96bdd2c270bcc1a0fccde
+  data.tar.gz: ce9da2a43a93d3eba73eafdce1070c4f049dc99fc7522c28c7fbb4f37b5a8ab0ca3f4a7866c66c29c739f5056b192fb08aad87a22e242e92cda9679c89281d28

data/README.md

@@ -1,7 +1,7 @@
 LaunchDarkly SSE Client for Ruby
 ================================
 
-[![Gem Version](https://badge.fury.io/rb/ld-eventsource.svg)](http://badge.fury.io/rb/ld-eventsource) [![Circle CI](https://circleci.com/gh/launchdarkly/ruby-eventsource/tree/master.svg?style=svg)](https://circleci.com/gh/launchdarkly/ruby-eventsource/tree/master)
+[![Gem Version](https://badge.fury.io/rb/ld-eventsource.svg)](http://badge.fury.io/rb/ld-eventsource) [![Circle CI](https://circleci.com/gh/launchdarkly/ruby-eventsource/tree/main.svg?style=svg)](https://circleci.com/gh/launchdarkly/ruby-eventsource/tree/main)
 
 A client for the [Server-Sent Events](https://www.w3.org/TR/eventsource/) protocol. This implementation runs on a worker thread, and uses the [`http`](https://rubygems.org/gems/http) gem to manage a persistent connection. Its primary purpose is to support the [LaunchDarkly SDK for Ruby](https://github.com/launchdarkly/ruby-client), but it can be used independently.
 

data/lib/ld-eventsource/client.rb

@@ -85,7 +85,7 @@ module SSE
     #   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 @@ module SSE
       if socket_factory
         http_client_options["socket_class"] = socket_factory
       end
-      
+
       if proxy
         @proxy = proxy
       else
@@ -202,12 +202,12 @@ module SSE
     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 @@ module SSE
         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 @@ module SSE
             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
               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 @@ module SSE
               # 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 @@ module SSE
       @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}" }

data/lib/ld-eventsource/impl/event_parser.rb

@@ -37,12 +37,15 @@ module SSE
               event = maybe_create_event
               reset_buffers
               gen.yield event if !event.nil?
-            else
-              case line
-                when /^(\w+): ?(.*)$/
-                  item = process_field($1, $2)
-                  gen.yield item if !item.nil?
-              end
+            elsif (pos = line.index(':'))
+              name = line.slice(0...pos)
+
+              pos += 1  # skip colon
+              pos += 1 if pos < line.length && line[pos] == ' '  # skip optional single space, per SSE spec
+              line = line.slice(pos..-1)
+
+              item = process_field(name, line)
+              gen.yield item if !item.nil?
             end
           end
         end
@@ -62,8 +65,11 @@ module SSE
           when "event"
             @type = value.to_sym
           when "data"
-            @data << "\n" if @have_data
-            @data << value
+            if @have_data
+              @data << "\n" << value
+            else
+              @data = value
+            end
             @have_data = true
           when "id"
             if !value.include?("\x00")

data/lib/ld-eventsource/version.rb

@@ -1,3 +1,3 @@
 module SSE
-  VERSION = "2.2.0"
+  VERSION = "2.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ld-eventsource
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.2
 platform: ruby
 authors:
 - LaunchDarkly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-31 00:00:00.000000000 Z
+date: 2023-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -136,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.4
+rubygems_version: 3.4.8
 signing_key: 
 specification_version: 4
 summary: LaunchDarkly SSE client