itsi-server 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e905bf6be508587ee73d0f537d422cb9dac5649529784b9009d7b206f4e1f338
-  data.tar.gz: 850add0021ebbace5ff48a990ddbef13154355cc9009d09275d9ebf3d11064dd
+  metadata.gz: 5e35db14d9bab3c6242ac77ed848ced5bc848d9d46b4113029859c2e1d984773
+  data.tar.gz: 0a3c7930f80c67ea454ee29fff76906c70465f8f6e36ec903196f89d799dc4de
 SHA512:
-  metadata.gz: a0569596062fafb1a7613e6dad2db993c99b9e0bec881eedb068938cba60a4646d0b8cd91ff9b74e2bbb25fb2ec6698e58f566265cb6a89a65d088cffbc66b3d
-  data.tar.gz: 8f0d9a03c1997da8c03752453af45b7732c13dcf44e6c939b7ad010b919052851f411269c6a0b7427ec53c4a1cbf2fd73f0d8a778e5e1ddc715e4c287c009d92
+  metadata.gz: 6e76c2016dc1d48492193bafa6e6d8af88a04affb4826745932a3060b8cf11351b84d06e12c87599cfc854a954dd17a628f8838affb4e9290937a829b5f22a31
+  data.tar.gz: b4f0b820e974710250ce2c776ebf7b8911668be9f9b6ade947023ebd3fb7f9770e6a07df348aaf38d385624771befaf531522d4bf44cb61c504356f8db960945

data/Cargo.lock

@@ -1644,7 +1644,7 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
 [[package]]
 name = "itsi-server"
-version = "0.2.5"
+version = "0.2.6"
 dependencies = [
  "argon2",
  "async-channel",

data/ext/itsi_scheduler/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "itsi-scheduler"
-version = "0.2.5"
+version = "0.2.6"
 edition = "2021"
 authors = ["Wouter Coppieters <wc@pico.net.nz>"]
 license = "MIT"

data/ext/itsi_server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "itsi-server"
-version = "0.2.5"
+version = "0.2.6"
 edition = "2021"
 authors = ["Wouter Coppieters <wc@pico.net.nz>"]
 license = "MIT"

data/ext/itsi_server/src/services/static_file_server.rs

@@ -662,7 +662,7 @@ impl StaticFileServer {
         let range_length = end - start + 1;
         let limited_reader = tokio::io::AsyncReadExt::take(file, range_length);
         let path_clone = path.clone();
-        let stream = ReaderStream::new(limited_reader)
+        let stream = ReaderStream::with_capacity(limited_reader, 64 * 1024)
             .map_ok(Frame::data)
             .map_err(move |e| {
                 warn!("Error streaming file {}: {}", path_clone.display(), e);
@@ -681,7 +681,7 @@ impl StaticFileServer {
         match File::open(&path).await {
             Ok(file) => {
                 let path_clone = path.clone();
-                let stream = ReaderStream::new(file)
+                let stream = ReaderStream::with_capacity(file, 64 * 1024)
                     .map_ok(Frame::data)
                     .map_err(move |e| {
                         warn!("Error streaming file {}: {}", path_clone.display(), e);

data/lib/itsi/http_request.rb

@@ -25,56 +25,73 @@ module Itsi
       hm.default_proc = proc { |_, key| "HTTP_#{key.upcase.gsub(/-/, "_")}" }
     end
 
+    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" => "",
+      "CONTENT_TYPE" => nil,
+      "CONTENT_LENGTH" => nil
+    }.freeze
+
     def to_rack_env
       path = self.path
       host = self.host
       version = self.version
-
-      {
-        "SERVER_SOFTWARE" => "Itsi",
-        "SCRIPT_NAME" => script_name,
-        "REQUEST_METHOD" => request_method,
-        "PATH_INFO" => path,
-        "REQUEST_PATH" => path,
-        "QUERY_STRING" => query_string,
-        "REMOTE_ADDR" => remote_addr,
-        "SERVER_PORT" => port.to_s,
-        "SERVER_NAME" => host,
-        "SERVER_PROTOCOL" => version,
-        "HTTP_HOST" => host,
-        "HTTP_VERSION" => version,
-        "itsi.request" => self,
-        "itsi.response" => response,
-        "rack.version" => [version],
-        "rack.url_scheme" => scheme,
-        "rack.input" => build_input_io,
-        "rack.errors" => $stderr,
-        "rack.multithread" => true,
-        "rack.multiprocess" => true,
-        "rack.run_once" => false,
-        "rack.hijack?" => true,
-        "rack.multipart.buffer_size" => 16_384,
-        "rack.hijack" => method(:hijack)
-      }.tap do |r|
-        headers.each do |(k, v)|
-          r[case k
-            when "content-type" then "CONTENT_TYPE"
-            when "content-length" then "CONTENT_LENGTH"
-            when "accept" then "HTTP_ACCEPT"
-            when "accept-encoding" then "HTTP_ACCEPT_ENCODING"
-            when "accept-language" then "HTTP_ACCEPT_LANGUAGE"
-            when "user-agent" then "HTTP_USER_AGENT"
-            when "referer" then "HTTP_REFERER"
-            when "origin" then "HTTP_ORIGIN"
-            when "cookie" then "HTTP_COOKIE"
-            when "authorization" then "HTTP_AUTHORIZATION"
-            when "x-forwarded-for" then "HTTP_X_FORWARDED_FOR"
-            when "x-forwarded-proto" then "HTTP_X_FORWARDED_PROTO"
-            else RACK_HEADER_MAP[k]
-            end
-          ] = v
-        end
+      env = RACK_ENV_TEMPLATE.dup
+      env["SCRIPT_NAME"] = script_name
+      env["REQUEST_METHOD"] = request_method
+      env["REQUEST_PATH"] = env["PATH_INFO"] = path
+      env["QUERY_STRING"] = query_string
+      env["REMOTE_ADDR"] = remote_addr
+      env["SERVER_PORT"] = port.to_s
+      env["HTTP_HOST"] = env["SERVER_NAME"] = host
+      env["HTTP_VERSION"] = env["SERVER_PROTOCOL"] = version
+      env["itsi.request"] = self
+      env["itsi.response"] = response
+      env["rack.version"][0] = version
+      env["rack.url_scheme"] = scheme
+      env["rack.input"] = build_input_io
+      env["rack.hijack"] = method(:hijack)
+      headers.each do |(k, v)|
+        env[case k
+          when "content-type" then "CONTENT_TYPE"
+          when "content-length" then "CONTENT_LENGTH"
+          when "accept" then "HTTP_ACCEPT"
+          when "accept-encoding" then "HTTP_ACCEPT_ENCODING"
+          when "accept-language" then "HTTP_ACCEPT_LANGUAGE"
+          when "user-agent" then "HTTP_USER_AGENT"
+          when "referer" then "HTTP_REFERER"
+          when "origin" then "HTTP_ORIGIN"
+          when "cookie" then "HTTP_COOKIE"
+          when "authorization" then "HTTP_AUTHORIZATION"
+          when "x-forwarded-for" then "HTTP_X_FORWARDED_FOR"
+          when "x-forwarded-proto" then "HTTP_X_FORWARDED_PROTO"
+          else RACK_HEADER_MAP[k]
+          end
+        ] = v
       end
+      env
     end
 
     def respond(

data/lib/itsi/server/config/middleware/grpc.md

@@ -13,7 +13,6 @@ Under the covers it:
 3. Automatically enables `gRPC` reflection (so client like `evans`, `grpcurl` or `Postman` can discover your service endpoints without needing access to raw `.proto` files).
 4. Supports optional per‑call compression (`none`, `deflate`, `gzip`) and a non‑blocking execution mode.
 
----
 
 ## Usage
 
@@ -97,8 +96,7 @@ require_relative 'echo_service_impl'
 
 bind "https://localhost:3000"
 grpc EchoServiceImpl.new,
-      nonblocking: false,
-      compression: 'gzip' do
+      nonblocking: false do
   # Nested middleware still works:
   response_headers additions: { 'X-Service' => ['Echo'] }
 end

data/lib/itsi/server/config/middleware/location.md

@@ -48,7 +48,7 @@ end
 ```ruby {filename="Itsi.rb"}
 # Match on non-route options.
 # Redirect http requests to https requests
-location protocols: ["http"]
+location schemes: ["http"]
   redirect type: :permanent, to: "https://{host}{path_and_query}"
 end
 ```
@@ -101,7 +101,7 @@ Pass these to the location block using keyword arguments, e.g.
 
 ```ruby
 # Redirect all http JSON requests to use https exclusively.
-location protocols: ["http"], content_types: ["application/json"]
+location schemes: ["http"], content_types: ["application/json"]
   redirect type: :permanent, to: "https://{host}{path_and_query}"
 end
 ```

data/lib/itsi/server/config/middleware/log_requests.md

@@ -21,7 +21,7 @@ log_requests \
 ```
 
 
-The log statement can populated with several different placeholders.
+The log statement can populated with several different placeholders, using [String Rewrite](/middleware/string_rewrite) functionality.
 Available values are:
 
 ### `before` Format String
@@ -46,6 +46,8 @@ Available values are:
 * `response_time` - The response time in milliseconds
 * `<Header-Name>`: Any existing response header. For example `{Content-Type}` or `{Set-Cookie}` will be replaced with its current value.
 
+See [String Rewrite](/middleware/string_rewrite) for more advanced string manipulation options.
+
 
 ### Path Attributes
 In addition to this, any capture groups referenced by container location blocks

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

@@ -9,13 +9,13 @@ The Reverse Proxy middleware enables reverse proxying by forwarding incoming HTT
 
 ```ruby
 proxy \
-  to: "http://backend.example.com/api{path}{query}", \
-  backends: ["127.0.0.1:3001", "127.0.0.1:3002"], \
-  backend_priority: "round_robin", \
-  headers: { "X-Forwarded-For" => { rewrite: "{addr}" } }, \
-  verify_ssl: false, \
-  timeout: 30, \
-  tls_sni: true, \
+  to: "http://backend.example.com/api{path}{query}",
+  backends: ["127.0.0.1:3001", "127.0.0.1:3002"],
+  backend_priority: "round_robin",
+  headers: { "X-Forwarded-For" => { rewrite: "{addr}" } },
+  verify_ssl: false,
+  timeout: 30,
+  tls_sni: true,
   error_response: "bad_gateway"
 ```
 ## Options

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

@@ -6,6 +6,8 @@ url: /options/reuse_address
 Configures whether the server should bind to the underlying socket using the `SO_REUSEADDR` option.
 This option determines whether the server allows the reuse of local addresses during binding. This can be useful in scenarios where a socket needs to be quickly rebound without waiting for the operating system to release the address.
 
+The default value is `false`.
+
 ## Configuration
 ```ruby {filename=Itsi.rb}
 reuse_address true

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

@@ -10,7 +10,7 @@ module Itsi
         detail "Configures whether the server should set the reuse_address option on the underlying socket."
 
         schema do
-          (Bool() & Required()).default(true)
+          (Bool() & Required()).default(false)
         end
 
       end

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

@@ -6,6 +6,8 @@ url: /options/reuse_port
 Configures whether the server should bind to the underlying socket using the `SO_REUSEPORT` option.
 This option determines whether multiple sockets can listen on the same IP and port combination, which can improve load balancing and fault tolerance in multi-threaded or multi-process server applications.
 
+The default value is `false`.
+
 ## Configuration
 ```ruby {filename=Itsi.rb}
 reuse_port true

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

@@ -10,7 +10,7 @@ module Itsi
         detail "Configures whether the server should set the reuse_port option on the underlying socket."
 
         schema do
-          (Bool() & Required()).default(true)
+          (Bool() & Required()).default(false)
         end
 
       end

data/lib/itsi/server/version.rb

@@ -2,6 +2,6 @@
 
 module Itsi
   class Server
-    VERSION = "0.2.5"
+    VERSION = "0.2.6"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: itsi-server
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Wouter Coppieters