isomorfeus-transport 2.1.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 248d55d33e660304657af70d2cff956e834bea7b1fc79004c6f0922e9ac5ce14
-  data.tar.gz: 125ddf417c613bdeec962604212db44a71bf37f940bbf9b35b56feb2385c7b10
+  metadata.gz: 73dc7fdfde8b9fd88f0d5c0771e94089ac870ab439497e941c39a8086461763f
+  data.tar.gz: 4a0f6bc9d44166a1e6362829ac6f2309296e043d7cd57de3c460e1956f964ea7
 SHA512:
-  metadata.gz: a9f11baa08314ac284180432ec36ff641e2544c5f592ef17cd6832ce408dbddec51d401a278067f9f2fe68cdd5bebccad974143fa5416179c7cdca6b04ba7ede
-  data.tar.gz: 7fd94cf7fcec1fdb3c0b81c755b6c39330fe437cd2c4a9d9673fa0bc45025ddba6863d88871563234aea59d754d980af88b616f698d03bc39abd44b4d02a2052
+  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/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.1.1'
+    VERSION = '2.2.0'
   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.1
+  version: 2.2.0
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-16 00:00:00.000000000 Z
+date: 2022-02-20 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.12
+        version: 0.14.17
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.12
+        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.36
+        version: 10.6.40
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.6.36
+        version: 10.6.40
 - !ruby/object:Gem::Dependency
   name: isomorfeus-policy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: isomorfeus-redux
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.17
+        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: 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: 4.1.17
+        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.1
+        version: 2.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        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