isomorfeus-transport 2.1.0 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ca90b01b8e0190145be6337a5d426a696d14fdf930d27459580c68b1c79f7e0
-  data.tar.gz: 96a02a4bc0c826f8099464c2186c4d43465a22d23acbc7b78427e765453f47b5
+  metadata.gz: 6434b38ce5be03fb545a2db27f311f06ce836417c0c2eebc9bd6ae8097b674a7
+  data.tar.gz: e69c76539a86c6452b6b78f69f1c960e319a500c0fca5552e2d635ed72e359b2
 SHA512:
-  metadata.gz: eb3a558d2a4932891262951936b0bfcd58dca2c76dca299bc4d289847070b1fac98deece4714424b727dc6d9545ca500c01a367b057c0eef89c45ddea08b9190
-  data.tar.gz: 43d8418632c1e4b848b16146f2e4367e5c0a80ba7e8d2d78a0699942206206bcf4630437733a4e4405440e332da16a9fa2740fad9eaa91a7ebfdc16693106221
+  metadata.gz: dfbc2ee59155e8dd136db2b13a0c0b7efcf78fcfe8e5aca03e418985a3f86f7794523ab846e75f4ce323c79d41151494b0ae420e820f658e9983619d543f2c09
+  data.tar.gz: b884f387a05d4155dc1cd23930161bffc8c0f69eda8f25d943acc0a7e56787eaae1acd1c4670155048b4683fd9b56173c471695fcf443ab7f8493d6602d159d3

data/lib/isomorfeus/transport/client_processor.rb

@@ -21,9 +21,8 @@ module Isomorfeus
 
       def self.process_response(response_hash)
         response_hash[:response][:agent_ids].keys.each do |agent_id|
-          agent = Isomorfeus::Transport::RequestAgent.get!(agent_id)
-          Isomorfeus::Transport.unregister_request_in_progress(agent_id)
-          unless agent.promise.realized?
+          agent = Isomorfeus::Transport::RequestAgent.get(agent_id)
+          if agent && !agent.promise.realized?
             agent.full_response = response_hash
             agent.response = response_hash[:response][:agent_ids][agent_id]
             agent.promise.resolve(agent)

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

@@ -10,7 +10,7 @@ module Isomorfeus
           agents[object_id]
         end
 
-        def get!(object_id)
+        def del!(object_id)
           agents.delete(object_id.to_s)
         end
       end
@@ -27,7 +27,17 @@ module Isomorfeus
       def initialize(request = nil)
         @id = object_id.to_s
         self.class.agents[@id] = self
+        current_agent = self
         @promise = Promise.new
+        @promise.then do
+                        Isomorfeus::Transport.unregister_request_in_progress(current_agent.id)
+                        Isomorfeus::Transport::RequestAgent.del!(current_agent.id)
+                      end
+        @promise.fail do |e|
+                        STDERR.puts "#{e}"
+                        Isomorfeus::Transport.unregister_request_in_progress(current_agent.id)
+                        Isomorfeus::Transport::RequestAgent.del!(current_agent.id)
+                      end
         @request = request
         @sent = false
       end
@@ -37,6 +47,8 @@ module Isomorfeus
         self.processed = true
         Isomorfeus.raise_error(message: self.response[:error]) if self.response.key?(:error)
         self.result = block.call(self)
+        @promise.resolve(self) unless @promise.realized?
+        self.result
       end
     end
   end

data/lib/isomorfeus/transport/server_socket_processor.rb

@@ -9,10 +9,12 @@ module Isomorfeus
 
       def on_message(client, data)
         if Isomorfeus.development?
-          write_lock = Isomorfeus.zeitwerk_lock.try_write_lock
-          if write_lock
-            Isomorfeus.zeitwerk.reload
-            Isomorfeus.zeitwerk_lock.release_write_lock
+          if Isomorfeus.server_requires_reload?
+            write_lock = Isomorfeus.zeitwerk_lock.try_write_lock
+            if write_lock
+              Isomorfeus.zeitwerk.reload
+              Isomorfeus.zeitwerk_lock.release_write_lock
+            end
           end
           Isomorfeus.zeitwerk_lock.acquire_read_lock
         end

data/lib/isomorfeus/transport/version.rb

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

data/lib/isomorfeus-transport.rb

@@ -26,7 +26,14 @@ 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'
@@ -44,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'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-transport
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.2
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-14 00:00:00.000000000 Z
+date: 2022-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -38,6 +38,20 @@ 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
@@ -86,70 +100,98 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.10
+        version: 0.14.17
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.10
+        version: 0.14.17
 - !ruby/object:Gem::Dependency
   name: isomorfeus-hamster
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.6.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.6.6
 - !ruby/object:Gem::Dependency
   name: isomorfeus-preact
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.6.34
+        version: 10.6.45
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.6.34
+        version: 10.6.45
 - !ruby/object:Gem::Dependency
   name: isomorfeus-policy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.2
 - !ruby/object:Gem::Dependency
   name: isomorfeus-redux
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.15
+        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.15
+        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.1.0
+        version: 2.2.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.2
 - !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
@@ -277,7 +334,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Channels, authetication and various transport options for Isomorfeus.