itsi 0.1.0 → 0.1.3

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

@@ -2,12 +2,92 @@
 
 require_relative "server/version"
 require_relative "server/itsi_server"
+require_relative "signals"
+require_relative "request"
+require_relative "stream_io"
+require_relative "server/rack/handler/itsi"
 
 module Itsi
   class Server
-    # Call our Rack app with our request ENV.
+
+    def self.running?
+      @running ||= false
+    end
+
+    def self.start(app:, **opts)
+      server = new(app: ->{app}, **opts)
+      @running = true
+      Signal.trap('INT', 'DEFAULT')
+      server.start
+    ensure
+      @running = false
+    end
+
     def self.call(app, request)
-      app.call(request.to_env)
+      respond request, app.call(request.to_env)
+    end
+
+    def self.streaming_body?(body)
+      body.respond_to?(:call) && !body.respond_to?(:each)
+    end
+
+    def self.respond(request, (status, headers, body))
+      response = request.response
+
+      # Don't try and respond if we've been hijacked.
+      # The hijacker is now responsible for this.
+      return if request.hijacked
+
+      # 1. Set Status
+      response.status = status
+
+      # 2. Set Headers
+      headers.each do |key, value|
+        next response.add_header(key, value) unless value.is_a?(Array)
+
+        value.each do |v|
+          response.add_header(key, v)
+        end
+      end
+
+      # 3. Set Body
+      # 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 = streaming_body?(body) ? body : headers.delete("rack.hijack"))
+        body_streamer.call(StreamIO.new(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)
+        unless body.respond_to?(:each)
+          body = body.to_ary
+          raise "Body #to_ary didn't return an array" unless body.is_a?(Array)
+        end
+        # We offset this iteration intentionally,
+        # to optimize for the case where there's only one chunk.
+        buffer = nil
+        body.each do |part|
+          response.send_frame(buffer.to_s) if buffer
+          buffer = part
+        end
+
+        response.send_and_close(buffer.to_s)
+      else
+        response.send_and_close(body.to_s)
+      end
+    ensure
+      response.close_write
+      body.close if body.respond_to?(:close)
+    end
+
+    def self.start_scheduler_loop(scheduler_class, scheduler_task)
+      scheduler = scheduler_class.new
+      Fiber.set_scheduler(scheduler)
+      [scheduler, Fiber.schedule(&scheduler_task)]
     end
 
     # If scheduler is enabled

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

@@ -0,0 +1,23 @@
+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/lib/itsi/stream_io.rb

@@ -0,0 +1,38 @@
+module Itsi
+  class StreamIO
+    attr :response
+    def initialize(response)
+      @response = response
+    end
+
+    def read
+      response.recv_frame
+    end
+
+    def write(string)
+      response.send_frame(string)
+    end
+
+    def <<(string)
+      response.send_frame(string)
+    end
+
+    def flush
+      # No-op
+    end
+
+    def close
+      close_read
+      close_write
+    end
+
+    def close_read
+      response.close_read
+    end
+
+    def close_write
+      response.close_write
+    end
+
+  end
+end

data/gems/server/test/test_helper.rb

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

data/gems/server/test/test_itsi_server.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "test_helper"
+require_relative "test_helper"
 
 class TestItsiServer < Minitest::Test
   def test_that_it_has_a_version_number

data/lib/itsi/version.rb

@@ -1,3 +1,3 @@
 module Itsi
-  VERSION = "0.1.0"
+  VERSION = "0.1.3"
 end

data/tasks.txt

@@ -0,0 +1,18 @@
+- Release v0.1.3
+- Autocert (Hard. And dev certs use local CA)
+- Test on MOD
+- Filters (Medium)
+- Static File Serve (Medium).error pages
+- Preload Groups
+- Signal to log info
+- Dashboard
+
+- Polish and Release (At Lake)
+-- Log params (Think long and hard about what we should and shouldn't log)
+-- Parameterize EVERYTHING (OOB GC, and others)
+-- No unwrap or except
+-- Switch to direct scheduler integration
+-- Fix Scheduler Hanging test (Or remove it)
+
+Later:
+- Broken shutdown (sometimes) in Fiber mode

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: itsi
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.3
 platform: ruby
 authors:
 - Wouter Coppieters
 bindir: exe
 cert_chain: []
-date: 2025-03-01 00:00:00.000000000 Z
+date: 2025-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: itsi-server
@@ -15,28 +15,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: itsi-scheduler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.1.2
 description: Wrapper Gem for both the Itsi server and it's Fiber scheduler
 email:
 - wc@pico.net.nz
@@ -50,27 +50,47 @@ files:
 - Rakefile
 - crates/itsi_error/Cargo.lock
 - crates/itsi_error/Cargo.toml
+- crates/itsi_error/src/from.rs
 - crates/itsi_error/src/lib.rs
+- crates/itsi_instrument_entry/Cargo.toml
+- crates/itsi_instrument_entry/src/lib.rs
 - crates/itsi_rb_helpers/Cargo.lock
 - crates/itsi_rb_helpers/Cargo.toml
+- crates/itsi_rb_helpers/src/heap_value.rs
 - crates/itsi_rb_helpers/src/lib.rs
 - crates/itsi_scheduler/Cargo.toml
 - crates/itsi_scheduler/extconf.rb
+- crates/itsi_scheduler/src/itsi_scheduler.rs
+- crates/itsi_scheduler/src/itsi_scheduler/io_helpers.rs
+- crates/itsi_scheduler/src/itsi_scheduler/io_waiter.rs
+- crates/itsi_scheduler/src/itsi_scheduler/timer.rs
 - crates/itsi_scheduler/src/lib.rs
 - crates/itsi_server/Cargo.toml
 - crates/itsi_server/extconf.rb
+- crates/itsi_server/src/body_proxy/big_bytes.rs
+- crates/itsi_server/src/body_proxy/itsi_body_proxy.rs
+- crates/itsi_server/src/body_proxy/mod.rs
 - crates/itsi_server/src/lib.rs
 - crates/itsi_server/src/request/itsi_request.rs
 - crates/itsi_server/src/request/mod.rs
+- crates/itsi_server/src/response/itsi_response.rs
+- crates/itsi_server/src/response/mod.rs
 - crates/itsi_server/src/server/bind.rs
+- crates/itsi_server/src/server/bind_protocol.rs
+- crates/itsi_server/src/server/io_stream.rs
 - crates/itsi_server/src/server/itsi_ca/itsi_ca.crt
 - crates/itsi_server/src/server/itsi_ca/itsi_ca.key
 - crates/itsi_server/src/server/itsi_server.rs
+- crates/itsi_server/src/server/lifecycle_event.rs
 - crates/itsi_server/src/server/listener.rs
 - crates/itsi_server/src/server/mod.rs
+- crates/itsi_server/src/server/process_worker.rs
+- crates/itsi_server/src/server/serve_strategy/cluster_mode.rs
+- crates/itsi_server/src/server/serve_strategy/mod.rs
+- crates/itsi_server/src/server/serve_strategy/single_mode.rs
+- crates/itsi_server/src/server/signal.rs
+- crates/itsi_server/src/server/thread_worker.rs
 - crates/itsi_server/src/server/tls.rs
-- crates/itsi_server/src/server/transfer_protocol.rs
-- crates/itsi_server/src/stream_writer/mod.rs
 - crates/itsi_tracing/Cargo.lock
 - crates/itsi_tracing/Cargo.toml
 - crates/itsi_tracing/src/lib.rs
@@ -87,13 +107,47 @@ files:
 - gems/scheduler/bin/setup
 - gems/scheduler/ext/itsi_error/Cargo.lock
 - gems/scheduler/ext/itsi_error/Cargo.toml
+- gems/scheduler/ext/itsi_error/src/from.rs
 - gems/scheduler/ext/itsi_error/src/lib.rs
+- gems/scheduler/ext/itsi_instrument_entry/Cargo.toml
+- gems/scheduler/ext/itsi_instrument_entry/src/lib.rs
 - gems/scheduler/ext/itsi_rb_helpers/Cargo.lock
 - gems/scheduler/ext/itsi_rb_helpers/Cargo.toml
+- gems/scheduler/ext/itsi_rb_helpers/src/heap_value.rs
 - gems/scheduler/ext/itsi_rb_helpers/src/lib.rs
 - gems/scheduler/ext/itsi_scheduler/Cargo.toml
 - gems/scheduler/ext/itsi_scheduler/extconf.rb
+- gems/scheduler/ext/itsi_scheduler/src/itsi_scheduler.rs
+- gems/scheduler/ext/itsi_scheduler/src/itsi_scheduler/io_helpers.rs
+- gems/scheduler/ext/itsi_scheduler/src/itsi_scheduler/io_waiter.rs
+- gems/scheduler/ext/itsi_scheduler/src/itsi_scheduler/timer.rs
 - gems/scheduler/ext/itsi_scheduler/src/lib.rs
+- gems/scheduler/ext/itsi_server/Cargo.toml
+- gems/scheduler/ext/itsi_server/extconf.rb
+- gems/scheduler/ext/itsi_server/src/body_proxy/big_bytes.rs
+- gems/scheduler/ext/itsi_server/src/body_proxy/itsi_body_proxy.rs
+- gems/scheduler/ext/itsi_server/src/body_proxy/mod.rs
+- gems/scheduler/ext/itsi_server/src/lib.rs
+- gems/scheduler/ext/itsi_server/src/request/itsi_request.rs
+- gems/scheduler/ext/itsi_server/src/request/mod.rs
+- gems/scheduler/ext/itsi_server/src/response/itsi_response.rs
+- gems/scheduler/ext/itsi_server/src/response/mod.rs
+- gems/scheduler/ext/itsi_server/src/server/bind.rs
+- gems/scheduler/ext/itsi_server/src/server/bind_protocol.rs
+- gems/scheduler/ext/itsi_server/src/server/io_stream.rs
+- gems/scheduler/ext/itsi_server/src/server/itsi_ca/itsi_ca.crt
+- gems/scheduler/ext/itsi_server/src/server/itsi_ca/itsi_ca.key
+- gems/scheduler/ext/itsi_server/src/server/itsi_server.rs
+- gems/scheduler/ext/itsi_server/src/server/lifecycle_event.rs
+- gems/scheduler/ext/itsi_server/src/server/listener.rs
+- gems/scheduler/ext/itsi_server/src/server/mod.rs
+- gems/scheduler/ext/itsi_server/src/server/process_worker.rs
+- gems/scheduler/ext/itsi_server/src/server/serve_strategy/cluster_mode.rs
+- gems/scheduler/ext/itsi_server/src/server/serve_strategy/mod.rs
+- gems/scheduler/ext/itsi_server/src/server/serve_strategy/single_mode.rs
+- gems/scheduler/ext/itsi_server/src/server/signal.rs
+- gems/scheduler/ext/itsi_server/src/server/thread_worker.rs
+- gems/scheduler/ext/itsi_server/src/server/tls.rs
 - gems/scheduler/ext/itsi_tracing/Cargo.lock
 - gems/scheduler/ext/itsi_tracing/Cargo.toml
 - gems/scheduler/ext/itsi_tracing/src/lib.rs
@@ -101,8 +155,16 @@ files:
 - gems/scheduler/lib/itsi/scheduler.rb
 - gems/scheduler/lib/itsi/scheduler/version.rb
 - gems/scheduler/sig/itsi_scheduler.rbs
-- gems/scheduler/test/test_helper.rb
+- gems/scheduler/test/helpers/test_helper.rb
+- gems/scheduler/test/test_active_record.rb
+- gems/scheduler/test/test_address_resolve.rb
+- gems/scheduler/test/test_block_unblock.rb
+- gems/scheduler/test/test_file_io.rb
 - gems/scheduler/test/test_itsi_scheduler.rb
+- gems/scheduler/test/test_kernel_sleep.rb
+- gems/scheduler/test/test_nested_fibers.rb
+- gems/scheduler/test/test_network_io.rb
+- gems/scheduler/test/test_process_wait.rb
 - gems/server/.gitignore
 - gems/server/.rubocop.yml
 - gems/server/CHANGELOG.md
@@ -115,36 +177,64 @@ files:
 - gems/server/exe/itsi
 - gems/server/ext/itsi_error/Cargo.lock
 - gems/server/ext/itsi_error/Cargo.toml
+- gems/server/ext/itsi_error/src/from.rs
 - gems/server/ext/itsi_error/src/lib.rs
+- gems/server/ext/itsi_instrument_entry/Cargo.toml
+- gems/server/ext/itsi_instrument_entry/src/lib.rs
 - gems/server/ext/itsi_rb_helpers/Cargo.lock
 - gems/server/ext/itsi_rb_helpers/Cargo.toml
+- gems/server/ext/itsi_rb_helpers/src/heap_value.rs
 - gems/server/ext/itsi_rb_helpers/src/lib.rs
+- gems/server/ext/itsi_scheduler/Cargo.toml
+- gems/server/ext/itsi_scheduler/extconf.rb
+- gems/server/ext/itsi_scheduler/src/itsi_scheduler.rs
+- gems/server/ext/itsi_scheduler/src/itsi_scheduler/io_helpers.rs
+- gems/server/ext/itsi_scheduler/src/itsi_scheduler/io_waiter.rs
+- gems/server/ext/itsi_scheduler/src/itsi_scheduler/timer.rs
+- gems/server/ext/itsi_scheduler/src/lib.rs
 - gems/server/ext/itsi_server/Cargo.toml
 - gems/server/ext/itsi_server/extconf.rb
+- gems/server/ext/itsi_server/src/body_proxy/big_bytes.rs
+- gems/server/ext/itsi_server/src/body_proxy/itsi_body_proxy.rs
+- gems/server/ext/itsi_server/src/body_proxy/mod.rs
 - gems/server/ext/itsi_server/src/lib.rs
 - gems/server/ext/itsi_server/src/request/itsi_request.rs
 - gems/server/ext/itsi_server/src/request/mod.rs
+- gems/server/ext/itsi_server/src/response/itsi_response.rs
+- gems/server/ext/itsi_server/src/response/mod.rs
 - gems/server/ext/itsi_server/src/server/bind.rs
+- gems/server/ext/itsi_server/src/server/bind_protocol.rs
+- gems/server/ext/itsi_server/src/server/io_stream.rs
 - gems/server/ext/itsi_server/src/server/itsi_ca/itsi_ca.crt
 - gems/server/ext/itsi_server/src/server/itsi_ca/itsi_ca.key
 - gems/server/ext/itsi_server/src/server/itsi_server.rs
+- gems/server/ext/itsi_server/src/server/lifecycle_event.rs
 - gems/server/ext/itsi_server/src/server/listener.rs
 - gems/server/ext/itsi_server/src/server/mod.rs
+- gems/server/ext/itsi_server/src/server/process_worker.rs
+- gems/server/ext/itsi_server/src/server/serve_strategy/cluster_mode.rs
+- gems/server/ext/itsi_server/src/server/serve_strategy/mod.rs
+- gems/server/ext/itsi_server/src/server/serve_strategy/single_mode.rs
+- gems/server/ext/itsi_server/src/server/signal.rs
+- gems/server/ext/itsi_server/src/server/thread_worker.rs
 - gems/server/ext/itsi_server/src/server/tls.rs
-- gems/server/ext/itsi_server/src/server/transfer_protocol.rs
-- gems/server/ext/itsi_server/src/stream_writer/mod.rs
 - gems/server/ext/itsi_tracing/Cargo.lock
 - gems/server/ext/itsi_tracing/Cargo.toml
 - gems/server/ext/itsi_tracing/src/lib.rs
 - gems/server/itsi-server.gemspec
 - 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/scheduler_mode.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/test_itsi_server.rb
 - lib/itsi.rb
 - lib/itsi/version.rb
+- tasks.txt
 homepage: https://itsi.fyi
 licenses:
 - MIT
@@ -164,7 +254,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.3.11
+      version: '3.2'
 requirements: []
 rubygems_version: 3.6.2
 specification_version: 4

data/crates/itsi_server/src/server/transfer_protocol.rs

@@ -1,23 +0,0 @@
-use itsi_error::ItsiError;
-use std::str::FromStr;
-
-#[derive(Debug, Default, Clone)]
-pub enum TransferProtocol {
-    #[default]
-    Https,
-    Http,
-    Unix,
-}
-
-impl FromStr for TransferProtocol {
-    type Err = ItsiError;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        match s {
-            "http" => Ok(TransferProtocol::Http),
-            "https" => Ok(TransferProtocol::Https),
-            "unix" => Ok(TransferProtocol::Unix),
-            _ => Err(ItsiError::UnsupportedProtocol(s.to_string())),
-        }
-    }
-}

data/crates/itsi_server/src/stream_writer/mod.rs

@@ -1,21 +0,0 @@
-use bytes::Bytes;
-use magnus::{error::Result as MagnusResult, exception::io_error, Error};
-use tokio::sync::mpsc::Sender;
-
-#[magnus::wrap(class = "Itsi::StreamWriter", free_immediately, size)]
-pub struct StreamWriter {
-    sender: Sender<Bytes>,
-}
-
-impl StreamWriter {
-    pub fn new(sender: Sender<Bytes>) -> Self {
-        StreamWriter { sender }
-    }
-
-    pub fn write(&self, bytes: Bytes) -> MagnusResult<()> {
-        self.sender
-            .blocking_send(bytes)
-            .map_err(|e| Error::new(io_error(), format!("{:?}", e)))?;
-        Ok(())
-    }
-}

data/gems/scheduler/test/test_helper.rb

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

data/gems/server/ext/itsi_server/src/server/transfer_protocol.rs

@@ -1,23 +0,0 @@
-use itsi_error::ItsiError;
-use std::str::FromStr;
-
-#[derive(Debug, Default, Clone)]
-pub enum TransferProtocol {
-    #[default]
-    Https,
-    Http,
-    Unix,
-}
-
-impl FromStr for TransferProtocol {
-    type Err = ItsiError;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        match s {
-            "http" => Ok(TransferProtocol::Http),
-            "https" => Ok(TransferProtocol::Https),
-            "unix" => Ok(TransferProtocol::Unix),
-            _ => Err(ItsiError::UnsupportedProtocol(s.to_string())),
-        }
-    }
-}

data/gems/server/ext/itsi_server/src/stream_writer/mod.rs

@@ -1,21 +0,0 @@
-use bytes::Bytes;
-use magnus::{error::Result as MagnusResult, exception::io_error, Error};
-use tokio::sync::mpsc::Sender;
-
-#[magnus::wrap(class = "Itsi::StreamWriter", free_immediately, size)]
-pub struct StreamWriter {
-    sender: Sender<Bytes>,
-}
-
-impl StreamWriter {
-    pub fn new(sender: Sender<Bytes>) -> Self {
-        StreamWriter { sender }
-    }
-
-    pub fn write(&self, bytes: Bytes) -> MagnusResult<()> {
-        self.sender
-            .blocking_send(bytes)
-            .map_err(|e| Error::new(io_error(), format!("{:?}", e)))?;
-        Ok(())
-    }
-}