isomorfeus-transport 2.0.21 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1101e4195c79d34ea44b85c977d941a4b1af4547fee50ea5b978d2b4d71b3e10
-  data.tar.gz: 16c9d6c19b31365c0fcef7fb1c525cf5835b0f21881da1741e8f1cc0b0c22ae9
+  metadata.gz: 73dc7fdfde8b9fd88f0d5c0771e94089ac870ab439497e941c39a8086461763f
+  data.tar.gz: 4a0f6bc9d44166a1e6362829ac6f2309296e043d7cd57de3c460e1956f964ea7
 SHA512:
-  metadata.gz: 4f386de344cf45e98b3f933899ac51f534c2bf2f4469b317809787318eb40a2f9138d3e1ac54a88e5730691b459f5bf62c7a4d5fcfdc4775704159374fbc4a1a
-  data.tar.gz: 158c556a9929a5f901d34119b8c453f41cf76112805d08b88c113f29950f70b0d857d2127be7bbb26e345c71318a82302a70afeb83ce42e414ce206cfc6e719d
+  metadata.gz: ccd348bcdcc4ba424d1d3f348a331f36c47d5d95ab7dbc6e0f3b92ec866896395f3fdaa550c6ce9408e89686fc5f09d0109c3824aa9b51de9f1350ce757fb13e
+  data.tar.gz: 95c448f2c43a817f0d7146c4b0c328827601257c37cb503e95909222792f866cfaeb23b3e94bfc507c063d72ce7a0616435d21bae9e5f56b12775a532dce980a

data/lib/isomorfeus/transport/compressor_rack.rb

@@ -0,0 +1,140 @@
+# frozen_string_literal: true
+
+module Isomorfeus
+  module Transport
+    class CompressorRack
+      C_ENCODINGS = %w[br gzip identity].freeze
+
+      def initialize(app, options = {})
+        @app = app
+      end
+
+      def call(env)
+        status, headers, body = @app.call(env)
+        headers = Rack::Utils::HeaderHash[headers]
+
+
+        unless should_deflate?(env, status, headers, body)
+          return [status, headers, body]
+        end
+
+        request = Rack::Request.new(env)
+
+        encoding = Rack::Utils.select_best_encoding(C_ENCODINGS,
+                                              request.accept_encoding)
+
+        vary = headers["Vary"].to_s.split(",").map(&:strip)
+        unless vary.include?("*") || vary.include?("Accept-Encoding")
+          headers["Vary"] = vary.push("Accept-Encoding").join(",")
+        end
+
+        case encoding
+        when "br"
+          headers['Content-Encoding'] = "br"
+          headers.delete(Rack::CONTENT_LENGTH)
+          [status, headers, BrotliStream.new(body, @sync)]
+        when "gzip"
+          headers['Content-Encoding'] = "gzip"
+          headers.delete(Rack::CONTENT_LENGTH)
+          mtime = headers["Last-Modified"]
+          mtime = Time.httpdate(mtime).to_i if mtime
+          [status, headers, GzipStream.new(body, mtime, @sync)]
+        when "identity"
+          [status, headers, body]
+        when nil
+          message = "An acceptable encoding for the requested resource #{request.fullpath} could not be found."
+          bp = Rack::BodyProxy.new([message]) { body.close if body.respond_to?(:close) }
+          [406, { CONTENT_TYPE => "text/plain", CONTENT_LENGTH => message.length.to_s }, bp]
+        end
+      end
+
+      class BrotliStream
+        BUFFER_LENGTH = 128 * 1_024
+
+        def initialize(body, sync)
+          @body = body
+          @sync
+        end
+
+        def each(&block)
+          @writer = block
+          brotli = ::Brotli::Writer.new(self, quality: 5)
+
+          if @body.is_a? ::File
+            while part = @body.read(BUFFER_LENGTH)
+              brotli.write(part)
+              brotli.flush if @sync
+            end
+          else
+            @body.each do |part|
+              next if part.empty?
+              brotli.write(part)
+              brotli.flush if @sync
+            end
+          end
+        ensure
+          brotli.close
+        end
+
+        def write(data)
+          @writer.call(data)
+        end
+
+        def close
+          @body.close if @body.respond_to?(:close)
+        end
+      end
+
+      class GzipStream
+        BUFFER_LENGTH = 128 * 1_024
+
+        def initialize(body, mtime, sync)
+          @body = body
+          @mtime = mtime
+          @sync = sync
+        end
+
+        def each(&block)
+          @writer = block
+          gzip = ::Zlib::GzipWriter.new(self)
+          gzip.mtime = @mtime if @mtime
+
+          if @body.is_a? ::File
+            while part = @body.read(BUFFER_LENGTH)
+              gzip.write(part)
+              gzip.flush if @sync
+            end
+          else
+            @body.each do |part|
+              next if part.empty?
+              gzip.write(part)
+              gzip.flush if @sync
+            end
+          end
+        ensure
+          gzip.close
+        end
+
+        def write(data)
+          @writer.call(data)
+        end
+
+        def close
+          @body.close if @body.respond_to?(:close)
+        end
+      end
+
+      private
+
+      def should_deflate?(env, status, headers, body)
+        if Rack::Utils::STATUS_WITH_NO_ENTITY_BODY.key?(status.to_i) ||
+            /\bno-transform\b/.match?(headers['Cache-Control'].to_s) ||
+            headers['Content-Encoding']&.!~(/\bidentity\b/)
+          return false
+        end
+        return false if headers[Rack::CONTENT_LENGTH] == '0'
+        true
+      end
+    end
+  end
+end

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/middlewares.rb

@@ -2,9 +2,9 @@ module Isomorfeus
   module Transport
     module Middlewares
       def use_isomorfeus_middlewares
-        puts "Isomorfeus is using the following middlewares:"
+        puts "Isomorfeus is using the following middlewares:" if Isomorfeus.production?
         Isomorfeus.middlewares.each do |isomorfeus_middleware|
-          puts "#{isomorfeus_middleware}"
+          puts "#{isomorfeus_middleware}" if Isomorfeus.production?
           use isomorfeus_middleware
         end
       end

data/lib/isomorfeus/transport/rack_middleware.rb

@@ -70,9 +70,14 @@ module Isomorfeus
           result
         end
       rescue Exception => e
-        # TODO
-        Isomorfeus.raise_error(error: e)
-        return [500, {}, '']
+        e_text = "#{e.class}: #{e.message}\n #{e.backtrace.join("\n")}"
+        STDERR.puts e_text
+        message = if Isomorfeus.production?
+                    "<html><head><title>Error</title></head><body>Sorry, a error occured!</body></html>"
+                  else
+                    "<html><head><title>#{e.class}</title></head><body><pre>#{e_text}</pre></body></html>"
+                  end
+        return [500, { Rack::CONTENT_TYPE => "text/html", Rack::CONTENT_LENGTH => message.length.to_s }, [message]]
       end
     end
   end

data/lib/isomorfeus/transport/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   module Transport
-    VERSION = '2.0.21'
+    VERSION = '2.2.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'
@@ -23,9 +26,17 @@ else
   require 'ostruct'
   require 'socket'
   require 'sorted_set'
+  require 'time'
+  require 'brotli'
+  require 'zlib'
   require 'oj'
+  require 'rack'
+  require 'rack/body_proxy'
+  require 'rack/request'
+  require 'rack/utils'
   require 'active_support'
   require 'isomorfeus-asset-manager'
+  require 'isomorfeus-hamster'
   require 'isomorfeus/transport/hamster_session_store'
   opal_path = Gem::Specification.find_by_name('opal').full_gem_path
   promise_path = File.join(opal_path, 'stdlib', 'promise.rb')
@@ -40,10 +51,12 @@ else
   require 'isomorfeus/transport/websocket_client'
   require 'isomorfeus/transport'
   require 'isomorfeus/transport/rack_middleware'
+  require 'isomorfeus/transport/compressor_rack'
   require 'isomorfeus/transport/middlewares'
 
-  Isomorfeus.add_middleware(Isomorfeus::Transport::RackMiddleware)
   Isomorfeus.add_middleware(Isomorfeus::AssetManager::RackMiddleware)
+  Isomorfeus.add_middleware(Isomorfeus::Transport::CompressorRack)
+  Isomorfeus.add_middleware(Isomorfeus::Transport::RackMiddleware)
 
   require 'lucid_handler/mixin'
   require 'lucid_handler/base'

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.21
+  version: 2.2.0
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-08 00:00:00.000000000 Z
+date: 2022-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.0.1
+        version: 7.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.0.1
+        version: 7.0.2
 - !ruby/object:Gem::Dependency
   name: bcrypt
   requirement: !ruby/object:Gem::Requirement
@@ -38,20 +38,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.16
+- !ruby/object:Gem::Dependency
+  name: brotli
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: isomorfeus-iodine
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.46
+        version: 0.7.47
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.46
+        version: 0.7.47
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
@@ -86,70 +100,98 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.8
+        version: 0.14.17
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.8
+        version: 0.14.17
 - !ruby/object:Gem::Dependency
   name: isomorfeus-hamster
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: 0.6.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: 0.6.6
 - !ruby/object:Gem::Dependency
   name: isomorfeus-preact
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.6.30
+        version: 10.6.40
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.6.30
+        version: 10.6.40
 - !ruby/object:Gem::Dependency
   name: isomorfeus-policy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.21
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.21
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: isomorfeus-redux
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.11
+        version: 4.1.18
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.1.18
+- !ruby/object:Gem::Dependency
+  name: isomorfeus-speednode
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.11
+        version: 0.5.2
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.2.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.2.3
 - !ruby/object:Gem::Dependency
   name: sorted_set
   requirement: !ruby/object:Gem::Requirement
@@ -164,20 +206,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.3
+- !ruby/object:Gem::Dependency
+  name: zlib
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.1
 - !ruby/object:Gem::Dependency
   name: isomorfeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.21
+        version: 2.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.21
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -198,14 +254,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.10.0
+        version: 3.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.10.0
+        version: 3.11.0
 description: Channels, authetication and various transport options for Isomorfeus.
 email: jan@kursator.de
 executables: []
@@ -217,6 +273,7 @@ files:
 - lib/isomorfeus-transport.rb
 - lib/isomorfeus/transport.rb
 - lib/isomorfeus/transport/client_processor.rb
+- lib/isomorfeus/transport/compressor_rack.rb
 - lib/isomorfeus/transport/config.rb
 - lib/isomorfeus/transport/hamster_session_store.rb
 - lib/isomorfeus/transport/handler/authentication_handler.rb