itsi-server 0.2.16 → 0.2.17

data/lib/itsi/http_request.rb

@@ -14,50 +14,35 @@ module Itsi
     EMPTY_IO = StringIO.new("").tap { |io| io.set_encoding(Encoding::ASCII_8BIT) }
 
     RACK_HEADER_MAP = StandardHeaders::ALL.map do |header|
-      rack_form = if header == "content-type"
-                    "CONTENT_TYPE"
-                  elsif header == "content-length"
-                    "CONTENT_LENGTH"
-                  else
-                    "HTTP_#{header.upcase.gsub(/-/, "_")}"
-                  end
+      rack_form = \
+        if header == "content-type"
+          "CONTENT_TYPE"
+        elsif header == "content-length"
+          "CONTENT_LENGTH"
+        else
+          "HTTP_#{header.upcase.gsub(/-/, "_")}"
+        end
       [header, rack_form]
-    end.to_h.tap do |hm|
-      hm.default_proc = proc { |_, key| "HTTP_#{key.upcase.gsub(/-/, "_")}" }
-    end
+    end.to_h
 
-    RACK_ENV_TEMPLATE = {
-      "SERVER_SOFTWARE" => "Itsi",
-      "rack.errors" => $stderr,
-      "rack.multithread" => true,
-      "rack.multiprocess" => true,
-      "rack.run_once" => false,
-      "rack.hijack?" => true,
-      "rack.multipart.buffer_size" => 16_384,
-      "SCRIPT_NAME" => "",
-      "REQUEST_METHOD" => "",
-      "PATH_INFO" => "",
-      "REQUEST_PATH" => "",
-      "QUERY_STRING" => "",
-      "REMOTE_ADDR" => "",
-      "SERVER_PORT" => "",
-      "SERVER_NAME" => "",
-      "SERVER_PROTOCOL" => "",
-      "HTTP_HOST" => "",
-      "HTTP_VERSION" => "",
-      "itsi.request" => "",
-      "itsi.response" => "",
-      "rack.version" => nil,
-      "rack.url_scheme" => "",
-      "rack.input" => "",
-      "rack.hijack" => ""
-    }.freeze
+    RACK_HEADER_MAP.default_proc = proc { |_, key| "HTTP_#{key.upcase.gsub(/-/, "_")}" }
+
+    HTTP_09 = "HTTP/0.9"
+    HTTP_09_ARR = ["HTTP/0.9"].freeze
+    HTTP_10 = "HTTP/1.0"
+    HTTP_10_ARR = ["HTTP/1.0"].freeze
+    HTTP_11 = "HTTP/1.1"
+    HTTP_11_ARR = ["HTTP/1.1"].freeze
+    HTTP_20 = "HTTP/2.0"
+    HTTP_20_ARR = ["HTTP/2.0"].freeze
+    HTTP_30 = "HTTP/3.0"
+    HTTP_30_ARR = ["HTTP/3.0"].freeze
 
     def to_rack_env
       path = self.path
       host = self.host
       version = self.version
-      env = RACK_ENV_TEMPLATE.dup
+      env = RackEnvPool.checkout
       env["SCRIPT_NAME"] = script_name
       env["REQUEST_METHOD"] = request_method
       env["REQUEST_PATH"] = env["PATH_INFO"] = path
@@ -68,11 +53,18 @@ module Itsi
       env["HTTP_VERSION"] = env["SERVER_PROTOCOL"] = version
       env["itsi.request"] = self
       env["itsi.response"] = response
-      env["rack.version"] = [version]
+      env["rack.version"] = \
+        case version
+        when HTTP_09 then HTTP_09_ARR
+        when HTTP_10 then HTTP_10_ARR
+        when HTTP_11 then HTTP_11_ARR
+        when HTTP_20 then HTTP_20_ARR
+        when HTTP_30 then HTTP_30_ARR
+        end
       env["rack.url_scheme"] = scheme
       env["rack.input"] = build_input_io
       env["rack.hijack"] = method(:hijack)
-      headers.each do |(k, v)|
+      each_header do |k, v|
         env[case k
             when "content-type" then "CONTENT_TYPE"
             when "content-length" then "CONTENT_LENGTH"

data/lib/itsi/http_response.rb

@@ -16,6 +16,7 @@ module Itsi
       body = body.to_s unless body.is_a?(String)
 
       if headers
+        reserve_headers(headers.size)
         headers.each do |key, value|
           if value.is_a?(Array)
             value.each { |v| add_header(key, v) }
@@ -40,5 +41,9 @@ module Itsi
         close
       end
     end
+
+    def flush
+      # No-op. Our Rust server performs stream coalescing and automatically flushes on a tight interval.
+    end
   end
 end

data/lib/itsi/rack_env_pool.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+module Itsi
+  module RackEnvPool
+
+    RACK_ENV_TEMPLATE = {
+      "SERVER_SOFTWARE" => "Itsi",
+      "rack.errors" => $stderr,
+      "rack.multithread" => true,
+      "rack.multiprocess" => true,
+      "rack.run_once" => false,
+      "rack.hijack?" => true,
+      "rack.multipart.buffer_size" => 16_384,
+      "SCRIPT_NAME" => "",
+      "REQUEST_METHOD" => "",
+      "PATH_INFO" => "",
+      "REQUEST_PATH" => "",
+      "QUERY_STRING" => "",
+      "REMOTE_ADDR" => "",
+      "SERVER_PORT" => "",
+      "SERVER_NAME" => "",
+      "SERVER_PROTOCOL" => "",
+      "HTTP_HOST" => "",
+      "HTTP_VERSION" => "",
+      "itsi.request" => "",
+      "itsi.response" => "",
+      "rack.version" => nil,
+      "rack.url_scheme" => "",
+      "rack.input" => "",
+      "rack.hijack" => ""
+    }.freeze
+
+    POOL = []
+
+    def self.checkout # rubocop:disable Metrics/CyclomaticComplexity,Metrics/MethodLength
+      POOL.pop&.tap do |recycled|
+        recycled.keys.each do |key|
+          case key
+          when "SERVER_SOFTWARE" then recycled[key] = "Itsi"
+          when "rack.errors" then recycled[key] = $stderr
+          when "rack.multithread", "rack.multiprocess", "rack.hijack?" then recycled[key] = true
+          when "rack.run_once" then recycled[key] = false
+          when "rack.multipart.buffer_size" then recycled[key] = 16_384
+          when "SCRIPT_NAME", "REQUEST_METHOD", "PATH_INFO", "REQUEST_PATH", "QUERY_STRING", "REMOTE_ADDR",
+               "SERVER_PORT", "SERVER_NAME", "SERVER_PROTOCOL", "HTTP_HOST", "HTTP_VERSION", "itsi.request",
+               "itsi.response", "rack.version", "rack.url_scheme", "rack.input", "rack.hijack"
+            nil
+          else recycled.delete(key)
+          end
+        end
+      end || RACK_ENV_TEMPLATE.dup
+    end
+
+    def self.checkin(env)
+      POOL << env
+    end
+  end
+
+end

data/lib/itsi/server/config/dsl.rb

@@ -55,8 +55,9 @@ module Itsi
             nested_locations: [],
             middleware_loader: lambda do
               @options[:nested_locations].each(&:call)
-              @middleware[:app] ||= {}
-              @middleware[:app][:app_proc] = @middleware[:app]&.[](:preloader)&.call || DEFAULT_APP[]
+              if !(@middleware[:app] || @middleware[:static_assets])
+                @middleware[:app] = { app_proc: DEFAULT_APP[]}
+              end
               [flatten_routes, Config.errors_to_error_lines(errors)]
             end
           }
@@ -74,7 +75,7 @@ module Itsi
           define_method(option_name) do |*args, **kwargs, &blk|
             option.new(self, *args, **kwargs, &blk).build!
           rescue Exception => e # rubocop:disable Lint/RescueException
-            @errors << [e, caller[1]]
+            @errors << [e, e.backtrace.find{|r| !(r =~ /server\/config/) }]
           end
         end
 
@@ -85,7 +86,7 @@ module Itsi
           rescue Config::Endpoint::InvalidHandlerException => e
             @errors << [e, "#{e.backtrace[0]}:in #{e.message}"]
           rescue Exception => e # rubocop:disable Lint/RescueException
-            @errors << [e, caller[1]]
+            @errors << [e, e.backtrace.find{|r| !(r =~ /server\/config/) }]
           end
         end
 

data/lib/itsi/server/config/middleware/proxy.rb

@@ -7,7 +7,7 @@ module Itsi
             to: "${1:http://backend.example.com{path_and_query}",
             backends: [${2:"127.0.0.1:3001", "127.0.0.1:3002"}],
             backend_priority: ${3|"round_robin","ordered","random"|},
-            headers: { ${4| "X-Forwarded-For" => { rewrite: "{addr}" },|} },
+            headers: { ${4| "X-Forwarded-For" =>  "{addr}"|} },
             verify_ssl: ${5|true,false|},
             timeout: ${6|30,60|},
             tls_sni: ${7|true,false|},

data/lib/itsi/server/config/middleware/rackup_file.rb

@@ -24,12 +24,12 @@ module Itsi
           super(location, params)
           raise "Rackup file must be a string" unless app.is_a?(String)
 
-          @app = Itsi::Server::RackInterface.for(app)
+          @app = app
         end
 
         def build!
           app_args = {
-            preloader: -> { @app },
+            preloader: -> { Itsi::Server::RackInterface.for(@app) },
             sendfile: @params[:sendfile],
             nonblocking: @params[:nonblocking],
             script_name: @params[:script_name],

data/lib/itsi/server/config/options/auto_reload_config.rb

@@ -14,11 +14,15 @@ module Itsi
         end
 
         def build!
+          return if @auto_reloading
+          src = caller.find{|l| !(l =~ /lib\/itsi\/server\/config/) }.split(":").first
+
           location.instance_eval do
             return if @auto_reloading
 
             if @included
               @included.each do |file|
+                next if  "#{file}.rb" == src
                 if ENV["BUNDLE_BIN_PATH"]
                   watch "#{file}.rb", [%w[bundle exec itsi restart]]
                 else
@@ -29,9 +33,9 @@ module Itsi
             @auto_reloading = true
 
             if ENV["BUNDLE_BIN_PATH"]
-              watch "Itsi.rb", [%w[bundle exec itsi restart]]
+              watch src, [%w[bundle exec itsi restart]]
             else
-              watch "Itsi.rb", [%w[itsi restart]]
+              watch src, [%w[itsi restart]]
             end
           end
         end

data/lib/itsi/server/config/options/include.rb

@@ -26,8 +26,11 @@ module Itsi
             end
           end
 
-          code = IO.read("#{included_file}.rb")
-          location.instance_eval(code, "#{included_file}.rb", 1)
+          filename =  File.expand_path("#{included_file}.rb")
+
+          code = IO.read(filename)
+          location.instance_eval(code, filename, 1)
+
         end
 
       end

data/lib/itsi/server/config/options/pipeline_flush.md

@@ -0,0 +1,16 @@
+---
+title: Pipeline Flush
+url: /options/pipeline_flush
+---
+
+Aggregates flushes to better support pipelined responses. (HTTP1 only)
+The default value is `false`.
+
+## Configuration
+```ruby {filename=Itsi.rb}
+pipeline_flush true
+```
+
+```ruby {filename=Itsi.rb}
+pipeline_flush false
+```

data/lib/itsi/server/config/options/pipeline_flush.rb

@@ -0,0 +1,19 @@
+module Itsi
+  class Server
+    module Config
+      class PipelineFlush < Option
+
+        insert_text <<~SNIPPET
+        pipeline_flush ${1|true,false|}
+        SNIPPET
+
+        detail "Aggregates flushes to better support pipelined responses. (HTTP1 only)."
+
+        schema do
+          (Bool() & Required()).default(false)
+        end
+
+      end
+    end
+  end
+end

data/lib/itsi/server/config/options/writev.md

@@ -0,0 +1,25 @@
+---
+title: Write Vectored
+url: /options/writev
+---
+
+Set whether HTTP/1 connections should try to use vectored writes,
+or always flatten into a single buffer.
+
+Note that setting this to false may mean more copies of body data,
+but may also improve performance when an IO transport doesn't
+support vectored writes well, such as most TLS implementations.
+
+Setting this to true will force hyper to use queued strategy
+which may eliminate unnecessary cloning on some TLS backends
+
+Default is `nil` in which case hyper will try to guess which mode to use
+
+## Configuration
+```ruby {filename=Itsi.rb}
+writev true
+```
+
+```ruby {filename=Itsi.rb}
+writev false
+```

data/lib/itsi/server/config/options/writev.rb

@@ -0,0 +1,19 @@
+module Itsi
+  class Server
+    module Config
+      class Writev < Option
+
+        insert_text <<~SNIPPET
+        writev ${1|true,false|}
+        SNIPPET
+
+        detail "Set whether HTTP/1 connections should try to use vectored writes"
+
+        schema do
+          (Bool() & Required()).default(false)
+        end
+
+      end
+    end
+  end
+end

data/lib/itsi/server/config.rb

@@ -44,9 +44,9 @@ module Itsi
               rate_limit key: "address", store_config: "in_memory", requests: 5, seconds: 10
               etag type: "strong", algorithm: "md5", min_body_size: 1024 * 1024
               compress min_size: 1024 * 1024, level: "fastest", algorithms: %w[zstd gzip br deflate],
-                        mime_types: %w[all], compress_streams: true
+                       mime_types: %w[all], compress_streams: true
               log_requests before: { level: "DEBUG", format: "[{request_id}] {method} {path_and_query} - {addr} " },
-                            after: { level: "DEBUG",
+                           after: { level: "DEBUG",
                                     format: "[{request_id}] └─ {status} in {response_time}" }
               nodelay false
               static_assets \
@@ -65,14 +65,19 @@ module Itsi
                 }
             end
           elsif File.exist?(config_file_path.to_s)
-            DSL.evaluate(config_file_path)
+            DSL.evaluate do
+              include config_file_path.gsub(".rb", "")
+              rackup_file args[:rackup_file], script_name: "/" if args.key?(:rackup_file)
+            end
           elsif File.exist?("./config.ru")
             DSL.evaluate do
               preload true
-              rackup_file args.fetch(:rackup_file, "./config.ru")
+              rackup_file args.fetch(:rackup_file, "./config.ru"), script_name: "/"
             end
           else
-            DSL.evaluate {}
+            DSL.evaluate do
+              rackup_file args[:rackup_file], script_name: "/" if args.key?(:rackup_file)
+            end
           end
 
         itsifile_config.transform_keys!(&:to_sym)
@@ -106,7 +111,7 @@ module Itsi
         end
 
         srv_config = {
-          workers: args.fetch(:workers) { itsifile_config.fetch(:workers, 1) },
+          workers: args.fetch(:workers) { itsifile_config.fetch(:workers, nil) },
           worker_memory_limit: args.fetch(:worker_memory_limit) { itsifile_config.fetch(:worker_memory_limit, nil) },
           silence: args.fetch(:silence) { itsifile_config.fetch(:silence, false) },
           shutdown_timeout: args.fetch(:shutdown_timeout) { itsifile_config.fetch(:shutdown_timeout, 5) },
@@ -127,7 +132,7 @@ module Itsi
           multithreaded_reactor: args.fetch(:multithreaded_reactor) do
             itsifile_config.fetch(:multithreaded_reactor, nil)
           end,
-          pin_worker_cores: args.fetch(:pin_worker_cores) { itsifile_config.fetch(:pin_worker_cores, true) },
+          pin_worker_cores: args.fetch(:pin_worker_cores) { itsifile_config.fetch(:pin_worker_cores, false) },
           scheduler_class: args.fetch(:scheduler_class) { itsifile_config.fetch(:scheduler_class, nil) },
           oob_gc_responses_threshold: args.fetch(:oob_gc_responses_threshold) do
             itsifile_config.fetch(:oob_gc_responses_threshold, nil)
@@ -139,9 +144,15 @@ module Itsi
           log_format: args.fetch(:log_format) { itsifile_config.fetch(:log_format, nil) },
           log_target: args.fetch(:log_target) { itsifile_config.fetch(:log_target, nil) },
           log_target_filters: args.fetch(:log_target_filters) { itsifile_config.fetch(:log_target_filters, nil) },
+          pipeline_flush: itsifile_config.fetch(:pipeline_flush, true),
+          writev: itsifile_config.fetch(:writev, false),
+          max_concurrent_streams: itsifile_config.fetch(:max_concurrent_streams, nil),
+          max_local_error_reset_streams: itsifile_config.fetch(:max_local_error_reset_streams, nil),
+          max_header_list_size: itsifile_config.fetch(:max_header_list_size, 2 * 1024 * 1024),
+          max_send_buf_size: itsifile_config.fetch(:max_send_buf_size, 64 * 1024),
           binds: args.fetch(:binds) { itsifile_config.fetch(:binds, ["http://0.0.0.0:3000"]) },
           middleware_loader: middleware_loader,
-          listeners: args.fetch(:listeners) { nil },
+          listeners: args.fetch(:listeners, nil),
           reuse_address: itsifile_config.fetch(:reuse_address, true),
           reuse_port: itsifile_config.fetch(:reuse_port, true),
           listen_backlog: itsifile_config.fetch(:listen_backlog, 1024),
@@ -222,6 +233,8 @@ module Itsi
 
       # Find config file path, if it exists.
       def self.config_file_path(config_file_path = nil)
+        raise "Config file #{config_file_path} does not exist" if config_file_path && !File.exist?(config_file_path)
+
         config_file_path ||= \
           if File.exist?(ITSI_DEFAULT_CONFIG_FILE)
             ITSI_DEFAULT_CONFIG_FILE

data/lib/itsi/server/default_config/Itsi.rb

@@ -10,10 +10,7 @@ env = ENV.fetch("APP_ENV") { ENV.fetch("RACK_ENV", "development") }
 
 # Number of worker processes to spawn
 # If more than 1, Itsi will be booted in Cluster mode
-workers ENV.fetch("ITSI_WORKERS") {
-  require "etc"
-  env == "development" ? 1 : nil
-}
+workers ENV["ITSI_WORKERS"]&.to_i || env == "development" ? 1 : nil
 
 # Number of threads to spawn per worker process
 # For pure CPU bound applicationss, you'll get the best results keeping this number low

data/lib/itsi/server/grpc/grpc_call.rb

@@ -190,6 +190,8 @@ module Itsi
       end
     end
 
+    alias_method :each, :each_remote_read
+
     def bidi_streamer?
       input_stream? && output_stream?
     end

data/lib/itsi/server/grpc/grpc_interface.rb

@@ -79,7 +79,7 @@ module Itsi
       end
 
       def handle_client_streaming(active_call)
-        response = service.send(active_call.method_name, active_call.each_remote_read, active_call)
+        response = service.send(active_call.method_name, active_call)
         active_call.remote_send(response)
       end
 
@@ -94,7 +94,7 @@ module Itsi
       end
 
       def handle_bidi_streaming(active_call)
-        result = service.send(active_call.method_name, active_call.each_remote_read, active_call) do |response|
+        result = service.send(active_call.method_name, active_call.each, active_call) do |response|
           active_call.remote_send(response)
         end
         return unless result.is_a?(Enumerator)

data/lib/itsi/server/rack/handler/itsi.rb

@@ -8,7 +8,9 @@ module Rack
         port = options.fetch(:Port, 3001)
         ::Itsi::Server.start(
           {
-            binds: ["http://#{host}:#{port}"]
+            binds: ["http://#{host}:#{port}"],
+            threads: 5,
+            workers: 1
           }
         ) do
           run app

data/lib/itsi/server/rack_interface.rb

@@ -12,7 +12,7 @@ module Itsi
           end
         end
         lambda do |request|
-          Server.respond(request, app.call(request.to_rack_env))
+          Server.respond(request, app.call(env = request.to_rack_env), env)
         end
       end
 
@@ -20,14 +20,14 @@ module Itsi
       # Here we build the env, and invoke the Rack app's call method.
       # We then turn the Rack response into something Itsi server understands.
       def call(app, request)
-        respond request, app.call(request.to_rack_env)
+        respond request, app.call(env = request.to_rack_env), env
       end
 
       # Itsi responses are asynchronous and can be streamed.
       # Response chunks are sent using response.send_frame
       # and the response is finished using response.close_write.
       # If only a single chunk is written, you can use the #send_and_close method.
-      def respond(request, (status, headers, body))
+      def respond(request, (status, headers, body), env)
         response = request.response
 
         # Don't try and respond if we've been hijacked.
@@ -39,13 +39,16 @@ module Itsi
 
         # 2. Set Headers
         body_streamer = streaming_body?(body) ? body : headers.delete("rack.hijack")
-        headers.each do |key, value|
-          if value.is_a?(Array)
+
+        response.reserve_headers(headers.size)
+
+        for key, value in headers
+          case value
+          when String then response[key] = value
+          when Array
             value.each do |v|
               response[key] = v
             end
-          elsif value.is_a?(String)
-            response[key] = value
           end
         end
 
@@ -53,15 +56,15 @@ module Itsi
         # As soon as we start setting the response
         # the server will begin to stream it to the client.
 
-        # If we're partially hijacked or returned a streaming body,
-        # stream this response.
 
         if body_streamer
+          # If we're partially hijacked or returned a streaming body,
+          # stream this response.
           body_streamer.call(response)
 
-        # If we're enumerable with more than one chunk
-        # also stream, otherwise write in a single chunk
         elsif body.respond_to?(:each) || body.respond_to?(:to_ary)
+          # If we're enumerable with more than one chunk
+          # also stream, otherwise write in a single chunk
           unless body.respond_to?(:each)
             body = body.to_ary
             raise "Body #to_ary didn't return an array" unless body.is_a?(Array)
@@ -78,8 +81,10 @@ module Itsi
         else
           response.send_and_close(body.to_s)
         end
+      rescue EOFError
+        response.close
       ensure
-        response.close_write
+        RackEnvPool.checkin(env)
         body.close if body.respond_to?(:close)
       end
 

data/lib/itsi/server/scheduler_interface.rb

@@ -14,6 +14,8 @@ module Itsi
       def schedule(app, request)
         Fiber.schedule do
           app.call(request)
+        rescue StandardError => e
+          request.server_error(e.message)
         end
       end
     end

data/lib/itsi/server/version.rb

@@ -2,6 +2,6 @@
 
 module Itsi
   class Server
-    VERSION = "0.2.16"
+    VERSION = "0.2.17"
   end
 end

data/lib/itsi/server.rb

@@ -12,6 +12,7 @@ require_relative "server/rack/handler/itsi"
 require_relative "server/config"
 require_relative "server/typed_handlers"
 require_relative "standard_headers"
+require_relative "rack_env_pool"
 require_relative "http_request"
 require_relative "http_response"
 require_relative "passfile"