isomorfeus-transport 2.2.7 → 2.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f24005201bd81fffabf8eb0c0e0d4b7b51361262b2284d32302c9775b4d0419
-  data.tar.gz: 41783053c8effbce259a7dd8fb3c03414319dcafbbf035f25ccf163b2868f408
+  metadata.gz: 61b9d4429cf3e43b4fadd677b444bea47384bc0a88c7a14d376960613396cf92
+  data.tar.gz: 62996b83bfa8c96a270513a5c13a0efb16cf10200ab7ad311c17e22e2d5f41a5
 SHA512:
-  metadata.gz: cb62a2fc2e0d90369c2e405279675028b51f08876034cfaae2d85974b4c6bf4627f0afaa06d7b72814d47d1ca6f467c2283b5e49afaf572c35d88389ec396e8f
-  data.tar.gz: c68ef8966c649130493484aae442442b0e1a4e495436afa75a81fc2df18b176b87799e2f28bcf34ee8a6552944df72ab1e5049e7df6d80718632f60fe77ad5bf
+  metadata.gz: 6ddd35e09074cf16bd527f96f05731722c87d2332fce71b587745f2075b413e087dae84db3b1986d3b10c4ba15722fc956c24d9093ad6c7ff54061dc6643f451
+  data.tar.gz: 9906711665665937ff3648847d35e9b17442e35f1de265abfa482d99f67e38fccaa80a29e4d706d75288218b11f9816e2f3661e9181c606f5a17359856493baf

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.7'
+    VERSION = '2.2.10'
   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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-transport
 version: !ruby/object:Gem::Version
-  version: 2.2.7
+  version: 2.2.10
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-25 00:00:00.000000000 Z
+date: 2022-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -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.7
+        version: 2.2.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.7
+        version: 2.2.10
 - !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.7
+        version: 2.2.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.7
+        version: 2.2.10
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement