em-eventsource 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89ba2ccd10bc74a1358dbc581503f338095e9a653ad51865d1a04dbbde1bcac1
-  data.tar.gz: 7b67016f8017555f640117a8c01d4119a1797a2e23061cdd0298ddf30cada596
+  metadata.gz: 95c24ede142738fe85b07756853451e5bbebf4fd8410bd936e87605a16146282
+  data.tar.gz: 33f594c9bc4eacf1c964740954bf3886598fc868c5a9530bad649e458af732fd
 SHA512:
-  metadata.gz: b2331561a1cf7f49640c02927d727cf60316155dcbf99fa911dad0b284175690ff8f7641349ff02d597df500830260a96058cd476708eea8821dfb8a826d6185
-  data.tar.gz: f5473e5136b46be8d7abc45124ebcce0261ecc429d16c8139f01828dfb6a18e81d1c7dff9c4ba19d8af4125ff5ae5ca3796ec660e7f734510568dec522350b49
+  metadata.gz: 1b47b6ca2112aea7b2e1d6705337af0630c064212b176fcdf018dc9ad9058e74510136e700506348729ef791cf0c14285eb12f2ffe7cdfeabbcd0ca1c51e5e3c
+  data.tar.gz: f77ae58493e99174037db1adf956de52b590200530511d92563970e0cd9f0a11cf43210a4c7aac8cf1182b3814d62db0596b64be191282876605968316332cd1

data/lib/em-eventsource.rb

@@ -21,8 +21,6 @@ module EventMachine
     attr_reader :inactivity_timeout
     # Set the inactivity timeout
     attr_writer :inactivity_timeout
-    # Set the max_redirects
-    attr_writer :max_redirects
     # Ready state
     # The connection has not yet been established, or it was closed and the user agent is reconnecting.
     CONNECTING = 0
@@ -45,7 +43,6 @@ module EventMachine
       @last_event_id = nil
       @retry = 3 # seconds
       @inactivity_timeout = 60 # seconds
-      @max_redirects = 5
 
       @opens = []
       @errors = []
@@ -130,6 +127,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
@@ -139,6 +143,7 @@ module EventMachine
 
     def handle_headers(headers)
       if headers.redirection?
+        @req.close
         return
       end
       if headers.status != 200
@@ -196,9 +201,8 @@ module EventMachine
       headers = @headers.merge({'Cache-Control' => 'no-cache', 'Accept' => 'text/event-stream'})
       headers.merge!({'Last-Event-Id' => @last_event_id }) if not @last_event_id.nil?
       [conn, conn.get({ query: @query,
-                        redirects: @max_redirects,
                         head: headers,
-                        keepalive: true})]
+                        keepalive: true })]
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: em-eventsource
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - François de Metz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-02 00:00:00.000000000 Z
+date: 2018-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine