isomorfeus-transport 2.2.8 → 2.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d998320b297b8d6447e640c2dc8dc37e21d33c328518870aae3529683087b67c
-  data.tar.gz: 52794e70253bd689f3dfce2cf02cdfa8238a44a931fbc51bc81c823ed673f089
+  metadata.gz: d2499a5754b1bbc116b2580953d12f3efdbea64ea4d1c042c480125cce3dc46b
+  data.tar.gz: 1bd713b1cb253da8a5fd64003e2e446d86fa04f06ff875235bd439ec5d480dea
 SHA512:
-  metadata.gz: 7c424f12129f898db1853fdec5c591001568f4a1b4b6042c141310bbeeb462dd4f48ac22bd87f4471b2793dc86f9930683c6a3982f56550cbfdd77d261be91b8
-  data.tar.gz: 6eb7ab8874202b46fd5afd293ab3b9462350c8b89a5850bae4ea9a2d952172a3195315ae6294b6d1084bab70bedb058332da613ddfe6918a2b78b20da60629e1
+  metadata.gz: cb27ae1177bbd4b54220f1fe06b399a7f114d976da5aa75303bcde4ba898bcc0ef1b6a0bc9e1a63eedb0d71ff4ca30e21f11599c3ee83b0745f51228ed1e8e55
+  data.tar.gz: 25dd0d1c2bb406003bb9d6a8385ad7ddbeea57aba4ccecace3ce284ae5620b9fa9446529728a2d63cf37dfb6f0a4c7bd72d1003151bedaef26c62f5a723cdfaa

data/lib/isomorfeus/transport/config.rb

@@ -62,6 +62,7 @@ module Isomorfeus
           Isomorfeus.current_user_sid = user.sid
         else
           @current_user = Anonymous.new
+          Isomorfeus.current_user_sid = nil
         end
       end
     end

data/lib/isomorfeus/transport/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   module Transport
-    VERSION = '2.2.8'
+    VERSION = '2.2.9'
   end
 end

data/lib/isomorfeus/transport.rb

@@ -10,13 +10,13 @@ module Isomorfeus
           true
         end
 
-        def promise_connect(session_id = nil)
-          promise = Promise.new
+        def promise_connect(session_id = nil, promise = nil)
+          promise = Promise.new unless promise
           if @socket && @socket.ready_state < 2
             promise.resolve(true)
             return promise
           end
-          if Isomorfeus.on_browser?
+          if on_browser?
             window_protocol = `window.location.protocol`
             ws_protocol = window_protocol == 'https:' ? 'wss:' : 'ws:'
             ws_url = "#{ws_protocol}//#{`window.location.host`}#{Isomorfeus.api_websocket_path}"
@@ -26,14 +26,15 @@ module Isomorfeus
           headers = (session_id.nil? || session_id.empty?) ? nil : { 'Cookie': "session=#{session_id}" }
           @socket = Isomorfeus::Transport::WebsocketClient.new(ws_url, nil, headers)
           @socket.on_error do |error|
-            if Isomorfeus.on_browser?
+            if on_browser?
               `console.warn('Isomorfeus::Transport: Will try again, but so far error connecting:', error)`
               @socket.close
               after 1000 do
-                Isomorfeus::Transport.promise_connect
+                Isomorfeus::Transport.promise_connect(session_id, promise)
               end
             else
               Isomorfeus.raise_error(message: error.JS[:message], stack: error.JS[:stack])
+              promise.reject
             end
           end
           @socket.on_message do |event|
@@ -41,11 +42,16 @@ module Isomorfeus
             Isomorfeus::Transport::ClientProcessor.process(json_hash)
           end
           @socket.on_open do |event|
-            open_promise = Promise.new.resolve(true)
+            init_promises = []
             Isomorfeus.transport_init_class_names.each do |constant|
-              result_promise = constant.constantize.send(:init)
-              open_promise.then { result_promise } if result_promise.class == Promise
+              result = constant.constantize.send(:init)
+              init_promises << result if result.class == Promise
             end
+            open_promise = if init_promises.size > 0
+                             Promise.when(*init_promises)
+                           else
+                             Promise.new.resolve(true)
+                           end
             requests_in_progress[:requests].each_key do |request|
               agent = get_agent_for_request_in_progress(request)
               open_promise.then { promise_send_request(request) } if agent && !agent.sent
@@ -101,7 +107,11 @@ module Isomorfeus
               @socket.close
               after (Isomorfeus.on_ssr? ? 10 : 3000) do
                 @reconnect = true
-                Isomorfeus::Transport.promise_connect
+                if on_browser?
+                  Isomorfeus::Transport.promise_connect
+                else
+                  Isomorfeus.raise_error(message: 'Transport lost connection!')
+                end
               end
             end
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-transport
 version: !ruby/object:Gem::Version
-  version: 2.2.8
+  version: 2.2.9
 platform: ruby
 authors:
 - Jan Biedermann
@@ -128,28 +128,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.6.52
+        version: 10.6.54
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.6.52
+        version: 10.6.54
 - !ruby/object:Gem::Dependency
   name: isomorfeus-policy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.8
+        version: 2.2.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.8
+        version: 2.2.9
 - !ruby/object:Gem::Dependency
   name: isomorfeus-redux
   requirement: !ruby/object:Gem::Requirement
@@ -226,14 +226,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.8
+        version: 2.2.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.8
+        version: 2.2.9
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement