isomorfeus-transport 2.0.22 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b872518d86b0db6ce6e17df0c68430fbe77bda5e72570e5695d08b0ff446214d
-  data.tar.gz: 81d646f30892009b36c933a3e6776988404f273331edf8b604b3fea247945a3a
+  metadata.gz: 3ca90b01b8e0190145be6337a5d426a696d14fdf930d27459580c68b1c79f7e0
+  data.tar.gz: 96a02a4bc0c826f8099464c2186c4d43465a22d23acbc7b78427e765453f47b5
 SHA512:
-  metadata.gz: 56a070d1175c8c5de03ffccd696d018a3f1181403a230ba65204aec03162748e3c5850ff83df5c6bb098daa6afe3418a82f0643516dd117cf9c214ab28c4b1c0
-  data.tar.gz: 9a0fc1ab05ba1ccdb919fcb75ef09bc9a5eb9b618d056e0d00b774ee659d7c8cd5bcc37a1c2e57fe07f7f241e013dff9337ffb52a33f3735146348b5b3d66b0c
+  metadata.gz: eb3a558d2a4932891262951936b0bfcd58dca2c76dca299bc4d289847070b1fac98deece4714424b727dc6d9545ca500c01a367b057c0eef89c45ddea08b9190
+  data.tar.gz: 43d8418632c1e4b848b16146f2e4367e5c0a80ba7e8d2d78a0699942206206bcf4630437733a4e4405440e332da16a9fa2740fad9eaa91a7ebfdc16693106221

data/lib/isomorfeus/transport/config.rb

@@ -78,8 +78,8 @@ module Isomorfeus
         valid_channel_class_names.include?(class_name)
       end
 
-      def add_middleware(middleware)
-        Isomorfeus.middlewares << middleware
+      def add_middleware(new_middleware)
+        Isomorfeus.middlewares.push(new_middleware) unless Isomorfeus.middlewares.include?(new_middleware)
       end
 
       def insert_middleware_after(existing_middleware, new_middleware)
@@ -88,7 +88,7 @@ module Isomorfeus
           if index_of_existing
             Isomorfeus.middlewares.insert(index_of_existing + 1, new_middleware)
           else
-            Isomorfeus.middlewares << new_middleware
+            Isomorfeus.middlewares.push(new_middleware)
           end
         end
       end
@@ -99,13 +99,13 @@ module Isomorfeus
           if index_of_existing
             Isomorfeus.middlewares.insert(index_of_existing, new_middleware)
           else
-            Isomorfeus.middlewares << new_middleware
+            Isomorfeus.middlewares.push(new_middleware)
           end
         end
       end
 
       def middlewares
-        @middlewares ||= Set.new
+        @middlewares ||= []
       end
 
       def valid_handler_class_names
@@ -170,7 +170,7 @@ module Isomorfeus
     end
 
     self.session_store_init do
-      store_path = File.expand_path(File.join(Isomorfeus.root, 'data', Isomorfeus.env, 'session_store'))
+      store_path = File.expand_path(File.join(Isomorfeus.root, 'storage', Isomorfeus.env, 'session_store'))
       Isomorfeus::Transport::HamsterSessionStore.new(store_path)
     end
   end

data/lib/isomorfeus/transport/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   module Transport
-    VERSION = '2.0.22'
+    VERSION = '2.1.0'
   end
 end

data/lib/isomorfeus/transport.rb

@@ -6,7 +6,6 @@ module Isomorfeus
 
         def init
           @socket = nil
-          @initialized = false
           promise_connect if Isomorfeus.on_browser? || Isomorfeus.on_mobile?
           true
         end
@@ -42,23 +41,16 @@ module Isomorfeus
             Isomorfeus::Transport::ClientProcessor.process(json_hash)
           end
           @socket.on_open do |event|
-            if @initialized
-              requests_in_progress[:requests].each_key do |request|
-                agent = get_agent_for_request_in_progress(request)
-                promise_send_request(request) if agent && !agent.sent
-              end
-              promise.resolve(true)
-            else
-              @initialized = true
-              init_promises = []
-              Isomorfeus.transport_init_class_names.each do |constant|
-                result = constant.constantize.send(:init)
-                init_promises << result if result.class == Promise
-              end
-              if init_promises.size > 0
-                Promise.when(*init_promises).then { promise.resolve(true) }
-              end
+            open_promise = Promise.new.resolve(true)
+            Isomorfeus.transport_init_class_names.each do |constant|
+              result_promise = constant.constantize.send(:init)
+              open_promise.then { result_promise } if result_promise.class == Promise
+            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
             end
+            open_promise.then { promise.resolve(true) }
           end
           promise
         end
@@ -100,14 +92,15 @@ module Isomorfeus
             begin
               @socket.send(`JSON.stringify(#{{request: { agent_ids: { agent.id => request }}}.to_n})`)
               agent.sent = true
-              after(Isomorfeus.on_ssr? ? 8000 : 20000) do
+              after(Isomorfeus.on_ssr? ? 5000 : 20000) do
                 unless agent.promise.realized?
                   agent.promise.reject({agent_response: { error: 'Request timeout!' }, full_response: {}})
                 end
               end
             rescue
               @socket.close
-              after 5000 do
+              after (Isomorfeus.on_ssr? ? 10 : 3000) do
+                @reconnect = true
                 Isomorfeus::Transport.promise_connect
               end
             end

data/lib/isomorfeus-transport.rb

@@ -8,12 +8,15 @@ if RUBY_ENGINE == 'opal'
   require 'isomorfeus/transport/client_processor'
   require 'isomorfeus/transport/websocket_client'
   require 'isomorfeus/transport'
-  require 'isomorfeus/transport/ssr_login'
+
   require 'lucid_channel/mixin'
   require 'lucid_channel/base'
   Isomorfeus.zeitwerk.push_dir('channels')
   Isomorfeus.add_client_init_class_name('Isomorfeus::Transport')
-  Isomorfeus.add_transport_init_class_name('Isomorfeus::Transport::SsrLogin') if Isomorfeus.on_ssr?
+  if Isomorfeus.on_ssr?
+    require 'isomorfeus/transport/ssr_login'
+    Isomorfeus.add_transport_init_class_name('Isomorfeus::Transport::SsrLogin')
+  end
 else
   require 'base64'
   require 'digest'

data/node_modules/.package-lock.json

@@ -4,9 +4,9 @@
   "requires": true,
   "packages": {
     "node_modules/ws": {
-      "version": "8.4.2",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.4.2.tgz",
-      "integrity": "sha512-Kbk4Nxyq7/ZWqr/tarI9yIt/+iNNFOjBXEWgTb4ydaNHBNGgvf2QHbS9fdfsndfjFlFwEd4Al+mw83YkaD10ZA==",
+      "version": "8.5.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz",
+      "integrity": "sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==",
       "engines": {
         "node": ">=10.0.0"
       },

data/node_modules/ws/lib/websocket-server.js

@@ -49,6 +49,8 @@ class WebSocketServer extends EventEmitter {
    * @param {Boolean} [options.skipUTF8Validation=false] Specifies whether or
    *     not to skip UTF-8 validation for text and close messages
    * @param {Function} [options.verifyClient] A hook to reject connections
+   * @param {Function} [options.WebSocket=WebSocket] Specifies the `WebSocket`
+   *     class to use. It must be the `WebSocket` class or class that extends it
    * @param {Function} [callback] A listener for the `listening` event
    */
   constructor(options, callback) {
@@ -67,6 +69,7 @@ class WebSocketServer extends EventEmitter {
       host: null,
       path: null,
       port: null,
+      WebSocket,
       ...options
     };
 
@@ -356,7 +359,7 @@ class WebSocketServer extends EventEmitter {
       `Sec-WebSocket-Accept: ${digest}`
     ];
 
-    const ws = new WebSocket(null);
+    const ws = new this.options.WebSocket(null);
 
     if (protocols.size) {
       //

data/node_modules/ws/lib/websocket.js

@@ -766,6 +766,45 @@ function initAsClient(websocket, address, protocols, options) {
     opts.path = parts[1];
   }
 
+  if (opts.followRedirects) {
+    if (websocket._redirects === 0) {
+      websocket._originalHost = parsedUrl.host;
+
+      const headers = options && options.headers;
+
+      //
+      // Shallow copy the user provided options so that headers can be changed
+      // without mutating the original object.
+      //
+      options = { ...options, headers: {} };
+
+      if (headers) {
+        for (const [key, value] of Object.entries(headers)) {
+          options.headers[key.toLowerCase()] = value;
+        }
+      }
+    } else if (parsedUrl.host !== websocket._originalHost) {
+      //
+      // Match curl 7.77.0 behavior and drop the following headers. These
+      // headers are also dropped when following a redirect to a subdomain.
+      //
+      delete opts.headers.authorization;
+      delete opts.headers.cookie;
+      delete opts.headers.host;
+      opts.auth = undefined;
+    }
+
+    //
+    // Match curl 7.77.0 behavior and make the first `Authorization` header win.
+    // If the `Authorization` header is set, then there is nothing to do as it
+    // will take precedence.
+    //
+    if (opts.auth && !options.headers.authorization) {
+      options.headers.authorization =
+        'Basic ' + Buffer.from(opts.auth).toString('base64');
+    }
+  }
+
   let req = (websocket._req = get(opts));
 
   if (opts.timeout) {

data/node_modules/ws/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ws",
-  "version": "8.4.2",
+  "version": "8.5.0",
   "description": "Simple to use, blazing fast and thoroughly tested websocket client and server for Node.js",
   "keywords": [
     "HyBi",

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isomorfeus-transport",
   "dependencies": {
-    "ws": "8.4.2"
+    "ws": "8.5.0"
   }
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-transport
 version: !ruby/object:Gem::Version
-  version: 2.0.22
+  version: 2.1.0
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-12 00:00:00.000000000 Z
+date: 2022-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.9
+        version: 0.14.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.9
+        version: 0.14.10
 - !ruby/object:Gem::Dependency
   name: isomorfeus-hamster
   requirement: !ruby/object:Gem::Requirement
@@ -114,28 +114,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.6.31
+        version: 10.6.34
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.6.31
+        version: 10.6.34
 - !ruby/object:Gem::Dependency
   name: isomorfeus-policy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.22
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.22
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: isomorfeus-redux
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.22
+        version: 2.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.22
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement