itsi 0.1.8 → 0.1.9

data/gems/server/test/test_itsi_server.rb

@@ -1,9 +1,281 @@
-# frozen_string_literal: true
-
-require_relative "test_helper"
+require "socket"
+require "net/http"
+require "minitest/autorun"
 
 class TestItsiServer < Minitest::Test
   def test_that_it_has_a_version_number
     refute_nil ::Itsi::Server::VERSION
   end
+
+  def test_hello_world
+    run_app(lambda do |env|
+      [200, { "Content-Type" => "text/plain" }, ["Hello, World!"]]
+    end) do |uri|
+      assert_equal "Hello, World!", Net::HTTP.get(uri)
+    end
+  end
+
+  def test_post
+    run_app(lambda do |env|
+      assert_equal env["REQUEST_METHOD"], "POST"
+      assert_equal "data", env["rack.input"].read
+      [200, { "Content-Type" => "text/plain" }, ["Hello, World!"]]
+    end) do |uri|
+      assert_equal "Hello, World!", Net::HTTP.post(uri, "data").body
+    end
+  end
+
+  def test_full_hijack
+    run_app(lambda do |env|
+      io = env["rack.hijack"].call
+      io.write("HTTP/1.1 200 Ok\r\n")
+      io.write("Content-Type: text/plain\r\n")
+      io.write("Transfer-Encoding: chunked\r\n")
+      io.write("\r\n")
+      io.write("7\r\n")
+      io.write("Hello, \r\n")
+      io.write("6\r\n")
+      io.write("World!\r\n")
+      io.write("0\r\n\r\n")
+      io.close
+    end) do |uri|
+      assert_equal "Hello, World!", Net::HTTP.get(uri)
+    end
+  end
+
+  def test_streaming_body
+    run_app(lambda do |env|
+      [200, { "Content-Type" => "text/plain" }, lambda { |stream|
+        stream.write("Hello")
+        stream.write(", World!")
+        stream.close
+      }]
+    end) do |uri|
+      assert_equal "Hello, World!", Net::HTTP.get(uri)
+    end
+  end
+
+  def test_partial_hijack
+    run_app(lambda do |env|
+      [200, { "Content-Type" => "text/plain", "rack.hijack" => lambda { |stream|
+        stream.write("Hello")
+        stream.write(", World!")
+        stream.close
+      } }, []]
+    end) do |uri|
+      assert_equal "Hello, World!", Net::HTTP.get(uri)
+    end
+  end
+
+  def test_enumerable_body
+    run_app(lambda do |env|
+      [200, { "Content-Type" => "application/json" },
+       %W[one\n two\n three\n]]
+    end) do |uri|
+      assert_equal "one\ntwo\nthree\n", Net::HTTP.get(uri)
+    end
+  end
+
+  def test_scheduler_non_blocking
+    run_app(
+      lambda do |env|
+        sleep 0.25
+        [200, { "Content-Type" => "text/plain" }, "Hello, World!"]
+      end,
+      scheduler_class: "Itsi::Scheduler"
+    ) do |uri|
+      start_time = Time.now
+      20.times.map do
+        Thread.new do
+          assert_equal "Hello, World!", Net::HTTP.get(uri)
+        end
+      end.each(&:join)
+      assert_in_delta 0.25, Time.now - start_time, 0.5
+    end
+  end
+
+  def test_query_params
+    run_app(lambda do |env|
+      [200, { "Content-Type" => "text/plain" }, [env["QUERY_STRING"]]]
+    end) do |uri|
+      uri.query = "foo=bar&baz=qux"
+      assert_equal "foo=bar&baz=qux", Net::HTTP.get(uri)
+    end
+  end
+
+  def test_put_request
+    run_app(lambda do |env|
+      body = env["rack.input"].read
+      [200, { "Content-Type" => "text/plain" }, [body]]
+    end) do |uri|
+      uri_obj = URI(uri)
+      req = Net::HTTP::Put.new(uri_obj)
+      req.body = "put data"
+      response = Net::HTTP.start(uri_obj.hostname, uri_obj.port) { |http| http.request(req) }
+      assert_equal "put data", response.body
+    end
+  end
+
+  def test_custom_headers
+    run_app(lambda do |env|
+      header = env["HTTP_X_CUSTOM"] || ""
+      [200, { "Content-Type" => "text/plain" }, [header]]
+    end) do |uri|
+      uri_obj = URI(uri)
+      req = Net::HTTP::Get.new(uri_obj)
+      req["X-Custom"] = "custom-value"
+      response = Net::HTTP.start(uri_obj.hostname, uri_obj.port) { |http| http.request(req) }
+      assert_equal "custom-value", response.body
+    end
+  end
+
+  def test_error_response
+    response = nil
+    capture_subprocess_io do
+      run_app(lambda do |env|
+        raise "Intentional error for testing"
+      end) do |uri|
+        response = Net::HTTP.get_response(uri)
+      end
+    end
+    assert_equal "500", response.code
+  end
+
+  def test_redirect
+    run_app(lambda do |env|
+      [302, { "Location" => "http://example.com" }, []]
+    end) do |uri|
+      response = Net::HTTP.get_response(uri)
+      assert_equal "302", response.code
+      assert_equal "http://example.com", response["location"]
+    end
+  end
+
+  def test_not_found
+    run_app(lambda do |env|
+      if env["PATH_INFO"] == "/"
+        [200, { "Content-Type" => "text/plain" }, ["Home"]]
+      else
+        [404, { "Content-Type" => "text/plain" }, ["Not Found"]]
+      end
+    end) do |uri|
+      uri.path = "/nonexistent"
+      response = Net::HTTP.get_response(uri)
+      assert_equal "404", response.code
+      assert_equal "Not Found", response.body
+    end
+  end
+
+  def test_head_request
+    run_app(lambda do |env|
+      [200, { "Content-Type" => "text/plain", "Content-Length" => "13" }, ["Hello, World!"]]
+    end) do |uri|
+      uri_obj = URI(uri)
+      response = Net::HTTP.start(uri_obj.hostname, uri_obj.port) do |http|
+        http.head("/")
+      end
+      assert_equal "200", response.code
+      assert_empty response.body.to_s
+      assert_equal "13", response["content-length"]
+    end
+  end
+
+  def test_options_request
+    run_app(lambda do |env|
+      [200, { "Allow" => "GET,POST,OPTIONS", "Content-Type" => "text/plain" }, ["Options Response"]]
+    end) do |uri|
+      uri_obj = URI(uri)
+      req = Net::HTTP::Options.new(uri_obj)
+      response = Net::HTTP.start(uri_obj.hostname, uri_obj.port) { |http| http.request(req) }
+      assert_equal "200", response.code
+      assert_equal "GET,POST,OPTIONS", response["allow"]
+      assert_equal "Options Response", response.body
+    end
+  end
+
+  def test_cookie_handling
+    run_app(lambda do |env|
+      [200, { "Content-Type" => "text/plain", "Set-Cookie" => "session=abc123; Path=/" }, ["Cookie Test"]]
+    end) do |uri|
+      response = Net::HTTP.get_response(uri)
+      assert_equal "200", response.code
+      assert_match(/session=abc123/, response["set-cookie"])
+      assert_equal "Cookie Test", response.body
+    end
+  end
+
+  def test_multiple_headers
+    run_app(lambda do |env|
+      [200, { "Content-Type" => "text/plain", "X-Example" => "one, two, three" }, ["Multiple Headers"]]
+    end) do |uri|
+      response = Net::HTTP.get_response(uri)
+      assert_equal "200", response.code
+      assert_equal "one, two, three", response["x-example"]
+      assert_equal "Multiple Headers", response.body
+    end
+  end
+
+  def test_large_body
+    large_text = "A" * 10_000
+    run_app(lambda do |env|
+      [200, { "Content-Type" => "text/plain", "Content-Length" => large_text.bytesize.to_s }, [large_text]]
+    end) do |uri|
+      response = Net::HTTP.get_response(uri)
+      assert_equal "200", response.code
+      assert_equal large_text, response.body
+    end
+  end
+
+  def test_custom_status_code
+    run_app(lambda do |env|
+      [201, { "Content-Type" => "text/plain" }, ["Created"]]
+    end) do |uri|
+      response = Net::HTTP.get_response(uri)
+      assert_equal "201", response.code
+      assert_equal "Created", response.body
+    end
+  end
+
+  def test_empty_body
+    run_app(lambda do |env|
+      [204, { "Content-Type" => "text/plain" }, []]
+    end) do |uri|
+      response = Net::HTTP.get_response(uri)
+      assert_equal "204", response.code
+      assert_nil response.body
+    end
+  end
+
+  def test_utf8_response
+    utf8_text = "こんにちは世界"
+    run_app(lambda do |env|
+      [200, { "Content-Type" => "text/plain; charset=utf-8" }, [utf8_text]]
+    end) do |uri|
+      response = Net::HTTP.get_response(uri)
+      assert_equal "200", response.code
+      assert_equal utf8_text, response.body.force_encoding("UTF-8")
+    end
+  end
+
+  def test_custom_request_header
+    run_app(lambda do |env|
+      header_value = env["HTTP_X_MY_HEADER"] || ""
+      [200, { "Content-Type" => "text/plain" }, [header_value]]
+    end) do |uri|
+      uri_obj = URI(uri)
+      req = Net::HTTP::Get.new(uri_obj)
+      req["X-My-Header"] = "test-header"
+      response = Net::HTTP.start(uri_obj.hostname, uri_obj.port) { |http| http.request(req) }
+      assert_equal "test-header", response.body
+    end
+  end
+
+  def test_url_encoded_query_params
+    run_app(lambda do |env|
+      [200, { "Content-Type" => "text/plain" }, [env["QUERY_STRING"]]]
+    end) do |uri|
+      uri.query = "param=%C3%A9" # %C3%A9 represents 'é'
+      assert_equal "param=%C3%A9", Net::HTTP.get(uri)
+    end
+  end
 end

data/lib/itsi/version.rb

@@ -1,3 +1,3 @@
 module Itsi
-  VERSION = "0.1.8"
+  VERSION = '0.1.9'
 end

data/sandbox/deploy/main.tf

@@ -160,6 +160,7 @@ apt-get install zlib1g-dev libyaml-dev libssl-dev libffi-dev libgmp3-dev libclan
 apt-get clean && rm -rf /var/lib/apt/lists/* && apt-get autoremove -y
 curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
 curl https://mise.run | sh
+export HOME=/root
 echo "eval \"\$(/root/.local/bin/mise activate bash)\"" >> ~/.bashrc
 eval "$(/root/.local/bin/mise activate bash)"
 mise use ruby@3.4.2

data/sandbox/itsi_sandbox_rack/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: ../../gems/scheduler
   specs:
-    itsi-scheduler (0.1.7)
+    itsi-scheduler (0.1.8)
       rb_sys (~> 0.9.91)
 
 PATH
   remote: ../../gems/server
   specs:
-    itsi-server (0.1.7)
+    itsi-server (0.1.8)
       rack (>= 1.6)
       rb_sys (~> 0.9.91)
 

data/tasks.txt

@@ -1,9 +1,3 @@
-- Fix dependency lock issue
-- Check Iodine PostgreSQL fork support
-
-
-- Support adding let's encrypt email to cert string
-- Support single domain (not domain(s)).
 - Test on MOD
 - Filters (Medium)
 - Static File Serve (Medium).error pages

metadata

@@ -1,42 +1,42 @@
 --- !ruby/object:Gem::Specification
 name: itsi
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Wouter Coppieters
 bindir: exe
 cert_chain: []
-date: 2025-03-15 00:00:00.000000000 Z
+date: 2025-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: itsi-server
+  name: itsi-scheduler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.8
+        version: 0.1.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.8
+        version: 0.1.9
 - !ruby/object:Gem::Dependency
-  name: itsi-scheduler
+  name: itsi-server
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.8
+        version: 0.1.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.8
+        version: 0.1.9
 description: Wrapper Gem for both the Itsi server and it's Fiber scheduler
 email:
 - wc@pico.net.nz
@@ -227,16 +227,18 @@ files:
 - gems/server/ext/itsi_tracing/Cargo.toml
 - gems/server/ext/itsi_tracing/src/lib.rs
 - gems/server/itsi-server.gemspec
-- gems/server/lib/itsi/index.html.erb
+- gems/server/lib/itsi/index.html
 - gems/server/lib/itsi/request.rb
 - gems/server/lib/itsi/server.rb
 - gems/server/lib/itsi/server/rack/handler/itsi.rb
+- gems/server/lib/itsi/server/rack_interface.rb
+- gems/server/lib/itsi/server/scheduler_interface.rb
 - gems/server/lib/itsi/server/scheduler_mode.rb
+- gems/server/lib/itsi/server/signal_trap.rb
 - gems/server/lib/itsi/server/version.rb
-- gems/server/lib/itsi/signals.rb
 - gems/server/lib/itsi/stream_io.rb
 - gems/server/sig/itsi_server.rbs
-- gems/server/test/test_helper.rb
+- gems/server/test/helpers/test_helper.rb
 - gems/server/test/test_itsi_server.rb
 - lib/itsi.rb
 - lib/itsi/version.rb

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

@@ -1,23 +0,0 @@
-module Itsi
-  module Signals
-    DEFAULT_SIGNALS = ["DEFAULT", ""].freeze
-    module SignalTrap
-      def self.trap(signal, *args, &block)
-        if DEFAULT_SIGNALS.include?(command.to_s) && block.nil?
-          Itsi::Server.reset_signal_handlers
-          nil
-        else
-          super(signal, *args, &block)
-        end
-      end
-    end
-  end
-end
-
-[Kernel, Signal].each do |receiver|
-  receiver.singleton_class.prepend(Itsi::Signals::SignalTrap)
-end
-
-[Object].each do |receiver|
-  receiver.include(Itsi::Signals::SignalTrap)
-end

data/gems/server/test/test_helper.rb

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-$LOAD_PATH.unshift File.expand_path("../lib", __dir__)
-$LOAD_PATH.unshift __dir__
-require "itsi/server"
-
-require "minitest/autorun"