em-eventsource 0.2.3 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 461c9ac878e1f325156439b1d51c298db29fbcc9c23e769fdf0c480baeb83f57
-  data.tar.gz: 1b9077e69942f41ce43c304116bb7923b66cb398935e3da578b76e03176b60ec
+  metadata.gz: f824fba4e073244ab8f97abd68a1e638edee0f5c13f317040f9dc15b64ffe242
+  data.tar.gz: 9a560157f4bd6d8445e51b1eec508d63731e5d1c9f5b1be2505bae63ee50ba30
 SHA512:
-  metadata.gz: b689983d0970f0f072d1f34ea79c47948b084072ce94b014ef4da1b340cc9c6673a00a1eece3fbe2585e56425090fb7d4186275d6d2f097abafcf1bcacc1e455
-  data.tar.gz: 65d3b2e2f93416796ec3f958cc9d64253fd24db69c944b5f08aeb6f964efec3715330c9dbc2de3f095273d647358e304465d812c7a1e03918eaa2270c8254ae7
+  metadata.gz: b1893a4ca85fab366860240aa015b4b1d7ee3c9dea803420ee4d07c0a195c797699891f7139fa943fbe16fad0aadba570aec684d4ef0408da9e17c2437ed8f83
+  data.tar.gz: '0593bf3405f9203efbd32a237edc73b7b07563d1c8df573ab93b53f017c54bc6d5652b56e63343372929c23aaac3b91a63dd2d366f953e080a6b644560032278'

data/CHANGELOG.md

@@ -0,0 +1,13 @@
+# em-eventsource changelog
+
+## 0.3.2
+
+- Add TLS hostname verification by default [[#19](https://github.com/francois2metz/em-eventsource/pull/19)]
+
+## 0.3.1
+
+- Force UTF-8 encoding on incoming events [[#16](https://github.com/francois2metz/em-eventsource/pull/16)]
+
+## 0.3.0
+
+- Handle retry values sent by the server as milliseconds [[#14](https://github.com/francois2metz/em-eventsource/issues/14)]

data/README.md

@@ -10,7 +10,7 @@ Install with Rubygems:
 
 If you use bundler, add it to your Gemfile:
 
-    gem "em-eventsource", "~> 0.2.0"
+    gem "em-eventsource", "~> 0.3.0"
 
 ## Usage
 

data/lib/em-eventsource.rb

@@ -35,6 +35,7 @@ module EventMachine
     # query - the query string as hash
     # headers - the headers for the request as hash
     def initialize(url, query={}, headers={})
+      @conn = nil
       @url = url
       @query = query
       @headers = headers
@@ -117,6 +118,9 @@ module EventMachine
       @req.callback(&method(:handle_reconnect))
       buffer = ""
       @req.stream do |chunk|
+        unless chunk.valid_encoding?
+          chunk.scrub!('?')
+        end
         buffer += chunk
         while index = buffer.index(/\r\n\r\n|\n\n/)
           stream = buffer.slice!(0..index)
@@ -127,6 +131,13 @@ module EventMachine
 
     def handle_reconnect(*args)
       return if @ready_state == CLOSED
+
+      if @req.response_header.redirection?
+        @url = @req.response_header.location
+        listen
+        return
+      end
+
       @ready_state = CONNECTING
       @errors.each { |error| error.call("Connection lost. Reconnecting.") }
       EM.add_timer(@retry) do
@@ -135,6 +146,10 @@ module EventMachine
     end
 
     def handle_headers(headers)
+      if headers.redirection?
+        @req.close
+        return
+      end
       if headers.status != 200
         close
         @errors.each { |error| error.call("Unexpected response status #{headers.status}") }
@@ -165,7 +180,7 @@ module EventMachine
         end
         /^retry:(.+)$/.match(part) do |m|
           if m[1].strip! =~ /^[0-9]+$/
-            @retry = m[1].to_i
+            @retry = m[1].to_i / 1000
           end
         end
       end
@@ -179,7 +194,7 @@ module EventMachine
     end
 
     def prepare_request
-      conn = EM::HttpRequest.new(@url, inactivity_timeout: @inactivity_timeout)
+      conn = EM::HttpRequest.new(@url, {tls: {verify_peer: true}, inactivity_timeout: @inactivity_timeout})
       @middlewares.each do |middleware, block|
         if block
           conn.use(*middleware, &block)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: em-eventsource
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.2
 platform: ruby
 authors:
 - François de Metz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-18 00:00:00.000000000 Z
+date: 2020-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -103,6 +103,7 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
+- CHANGELOG.md
 - Gemfile
 - README.md
 - lib/em-eventsource.rb
@@ -124,8 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: em-eventsource is an eventmachine library to consume Server-Sent Events streaming