itsi 0.2.21.rc1 → 0.2.21

data/gems/scheduler/lib/itsi/scheduler/version.rb

@@ -2,6 +2,6 @@
 
 module Itsi
   class Scheduler
-    VERSION = "0.2.21.rc1"
+    VERSION = "0.2.21"
   end
 end

data/gems/server/Cargo.lock

@@ -1642,9 +1642,27 @@ version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
+[[package]]
+name = "itsi-scheduler"
+version = "0.2.21"
+dependencies = [
+ "bytes",
+ "derive_more",
+ "itsi_error",
+ "itsi_instrument_entry",
+ "itsi_rb_helpers",
+ "itsi_tracing",
+ "magnus",
+ "mio",
+ "nix",
+ "parking_lot",
+ "rb-sys",
+ "tracing",
+]
+
 [[package]]
 name = "itsi-server"
-version = "0.2.21-rc1"
+version = "0.2.21"
 dependencies = [
  "argon2",
  "async-channel",
@@ -1754,6 +1772,15 @@ dependencies = [
  "thiserror 2.0.12",
 ]
 
+[[package]]
+name = "itsi_instrument_entry"
+version = "0.1.0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "itsi_rb_helpers"
 version = "0.1.0"
@@ -1906,9 +1933,9 @@ checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
 
 [[package]]
 name = "magnus"
-version = "0.7.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d87ae53030f3a22e83879e666cb94e58a7bdf31706878a0ba48752994146dab"
+checksum = "3b36a5b126bbe97eb0d02d07acfeb327036c6319fd816139a49824a83b7f9012"
 dependencies = [
  "bytes",
  "magnus-macros",
@@ -1919,9 +1946,9 @@ dependencies = [
 
 [[package]]
 name = "magnus-macros"
-version = "0.6.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5968c820e2960565f647819f5928a42d6e874551cab9d88d75e3e0660d7f71e3"
+checksum = "47607461fd8e1513cb4f2076c197d8092d921a1ea75bd08af97398f593751892"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2554,18 +2581,18 @@ dependencies = [
 
 [[package]]
 name = "rb-sys"
-version = "0.9.111"
+version = "0.9.124"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "becea799ce051c16fb140be80f5e7cf781070f99ca099332383c2b17861249af"
+checksum = "c85c4188462601e2aa1469def389c17228566f82ea72f137ed096f21591bc489"
 dependencies = [
  "rb-sys-build",
 ]
 
 [[package]]
 name = "rb-sys-build"
-version = "0.9.111"
+version = "0.9.124"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64691175abc704862f60a9ca8ef06174080cc50615f2bf1d4759f46db18b4d29"
+checksum = "568068db4102230882e6d4ae8de6632e224ca75fe5970f6e026a04e91ed635d3"
 dependencies = [
  "bindgen",
  "lazy_static",
@@ -2578,9 +2605,9 @@ dependencies = [
 
 [[package]]
 name = "rb-sys-env"
-version = "0.1.2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a35802679f07360454b418a5d1735c89716bde01d35b1560fc953c1415a0b3bb"
+checksum = "cca7ad6a7e21e72151d56fe2495a259b5670e204c3adac41ee7ef676ea08117a"
 
 [[package]]
 name = "rcgen"
@@ -2972,9 +2999,9 @@ dependencies = [
 
 [[package]]
 name = "serde_magnus"
-version = "0.9.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51b8b945a2dadb221f1c5490cfb411cab6c3821446b8eca50ee07e5a3893ec51"
+checksum = "8ff64c88ddd26acdcad5a501f18bcc339927b77b69f4a03bfaf2a6fc5ba2ac4b"
 dependencies = [
  "magnus",
  "serde",

data/gems/server/lib/itsi/http_request.rb

@@ -27,6 +27,21 @@ module Itsi
 
     RACK_HEADER_MAP.default_proc = proc { |_, key| "HTTP_#{key.upcase.gsub(/-/, "_")}" }
 
+    SPECIAL_RACK_HEADER_MAP = {
+      "content-type" => "CONTENT_TYPE",
+      "content-length" => "CONTENT_LENGTH",
+      "accept" => "HTTP_ACCEPT",
+      "accept-encoding" => "HTTP_ACCEPT_ENCODING",
+      "accept-language" => "HTTP_ACCEPT_LANGUAGE",
+      "user-agent" => "HTTP_USER_AGENT",
+      "referer" => "HTTP_REFERER",
+      "origin" => "HTTP_ORIGIN",
+      "cookie" => "HTTP_COOKIE",
+      "authorization" => "HTTP_AUTHORIZATION",
+      "x-forwarded-for" => "HTTP_X_FORWARDED_FOR",
+      "x-forwarded-proto" => "HTTP_X_FORWARDED_PROTO"
+    }.freeze
+
     HTTP_09 = "HTTP/0.9"
     HTTP_09_ARR = ["HTTP/0.9"].freeze
     HTTP_10 = "HTTP/1.0"
@@ -63,24 +78,9 @@ module Itsi
         end
       env["rack.url_scheme"] = scheme
       env["rack.input"] = build_input_io
-      env["rack.hijack"] = method(:hijack)
+      env["rack.hijack"] = self
       each_header 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
+        env[SPECIAL_RACK_HEADER_MAP[k] || RACK_HEADER_MAP[k]] = v
       end
       env
     end
@@ -138,6 +138,11 @@ module Itsi
       end
     end
 
+    # Rack expects env["rack.hijack"] to respond to #call.
+    def call
+      hijack
+    end
+
     def body
       @body ||= build_input_io
     end

data/gems/server/lib/itsi/rack_env_pool.rb

@@ -32,23 +32,13 @@ module Itsi
 
     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
+    def self.checkout
+      recycled = POOL.pop
+      return RACK_ENV_TEMPLATE.dup unless recycled
+
+      # Reset in C rather than iterating key-by-key in Ruby for every request.
+      recycled.replace(RACK_ENV_TEMPLATE)
+      recycled
     end
 
     def self.checkin(env)

data/gems/server/lib/itsi/server/config/middleware/static_assets.rb

@@ -33,9 +33,16 @@ module Itsi
           }
         end
 
+        RedirectTarget = TypedStruct.new do
+          {
+            to: (Required() & Type(String)),
+            type: Enum(["permanent", "temporary", "found", "moved_permanently"]).default("moved_permanently")
+          }
+        end
+
         RedirectResponse = TypedStruct.new do
           {
-            redirect: Type(Redirect::Redirect) & Required()
+            redirect: Type(RedirectTarget) & Required()
           }
         end
 

data/gems/server/lib/itsi/server/rack_interface.rb

@@ -62,6 +62,18 @@ module Itsi
           # stream this response.
           body_streamer.call(response)
 
+        elsif body.is_a?(Array)
+          if body.length == 1
+            response.send_and_close(body[0].to_s)
+          else
+            buffer = nil
+            body.each do |part|
+              response << buffer.to_s if buffer
+              buffer = part
+            end
+
+            response.send_and_close(buffer.to_s)
+          end
         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

data/gems/server/lib/itsi/server/version.rb

@@ -2,6 +2,6 @@
 
 module Itsi
   class Server
-    VERSION = "0.2.21.rc1"
+    VERSION = "0.2.21"
   end
 end

data/lib/itsi/version.rb

@@ -1,3 +1,3 @@
 module Itsi
-  VERSION = "0.2.21.rc1"
+  VERSION = "0.2.21"
 end

data/mise.toml

@@ -0,0 +1,2 @@
+[tools]
+ruby = "4.0.1"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: itsi
 version: !ruby/object:Gem::Version
-  version: 0.2.21.rc1
+  version: 0.2.21
 platform: ruby
 authors:
 - Wouter Coppieters
@@ -15,28 +15,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.21.rc1
+        version: 0.2.21
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.21.rc1
+        version: 0.2.21
 - !ruby/object:Gem::Dependency
   name: itsi-server
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.21.rc1
+        version: 0.2.21
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.21.rc1
+        version: 0.2.21
 description: Wrapper Gem for both the Itsi server and the Itsi Fiber scheduler
 email:
 - wc@pico.net.nz
@@ -44,10 +44,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".dockerignore"
+- ".rubocop.yml"
 - ".zed/settings.json"
 - CHANGELOG.md
 - Cargo.lock
 - Cargo.toml
+- Dockerfile
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -1119,6 +1122,7 @@ files:
 - itsi-server-100.png
 - lib/itsi.rb
 - lib/itsi/version.rb
+- mise.toml
 homepage: https://itsi.fyi
 licenses:
 - LGPL-3.0