itsi-server 0.1.1 → 0.1.11

data/lib/itsi/server.rb

@@ -2,19 +2,89 @@
 
 require_relative "server/version"
 require_relative "server/itsi_server"
+require_relative "server/rack_interface"
+require_relative "server/signal_trap"
+require_relative "server/scheduler_interface"
+require_relative "server/rack/handler/itsi"
+require_relative "server/config"
+require_relative "request"
+require_relative "stream_io"
+
+# When you Run Itsi without a Rack app,
+# we start a tiny little echo server, just so you can see it in action.
+DEFAULT_INDEX = IO.read("#{__dir__}/index.html").freeze
+DEFAULT_BINDS = ["http://0.0.0.0:3000"].freeze
+DEFAULT_APP = lambda {
+  require "json"
+  require "itsi/scheduler"
+  Itsi.log_warn "No config.ru or Itsi.rb app detected. Running default app."
+  lambda do |env|
+    headers, body = \
+      if env["itsi.response"].json?
+        [
+          { "Content-Type" => "application/json" },
+          [{ "message" => "You're running on Itsi!", "rack_env" => env,
+             "version" => Itsi::Server::VERSION }.to_json]
+        ]
+      else
+        [
+          { "Content-Type" => "text/html" },
+          [
+            format(
+              DEFAULT_INDEX,
+              REQUEST_METHOD: env["REQUEST_METHOD"],
+              PATH_INFO: env["PATH_INFO"],
+              SERVER_NAME: env["SERVER_NAME"],
+              SERVER_PORT: env["SERVER_PORT"],
+              REMOTE_ADDR: env["REMOTE_ADDR"],
+              HTTP_USER_AGENT: env["HTTP_USER_AGENT"]
+            )
+          ]
+        ]
+      end
+    [200, headers, body]
+  end
+}
 
 module Itsi
   class Server
-    # Call our Rack app with our request ENV.
-    def self.call(app, request)
-      app.call(request.to_env)
-    end
+    extend RackInterface
+    extend SchedulerInterface
+
+    class << self
+      def running?
+        !!@running
+      end
+
+      def build(
+        app: DEFAULT_APP[],
+        loader: nil,
+        binds: DEFAULT_BINDS,
+        **opts
+      )
+        new(app: loader || -> { app }, binds: binds, **opts)
+      end
+
+      def start_in_background_thread(silence: true, **opts)
+        start(background: true, silence: silence, **opts)
+      end
 
-    # If scheduler is enabled
-    # Each request is wrapped in a Fiber.
-    def self.schedule(app, request)
-      Fiber.schedule do
-        call(app, request)
+      def start(background: false, silence: false, **opts)
+        build(**opts).tap do |server|
+          previous_handler = Signal.trap("INT", "DEFAULT")
+          @running = true
+          if background
+            Thread.new do
+              server.start
+              @running = false
+              Signal.trap("INT", previous_handler)
+            end
+          else
+            server.start
+            @running = false
+            Signal.trap("INT", previous_handler)
+          end
+        end
       end
     end
   end

data/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

metadata

@@ -1,28 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: itsi-server
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.11
 platform: ruby
 authors:
 - Wouter Coppieters
 bindir: exe
 cert_chain: []
-date: 2025-03-01 00:00:00.000000000 Z
+date: 2025-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: libclang
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '14.0'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '14.0'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rb_sys
   requirement: !ruby/object:Gem::Requirement
@@ -37,20 +37,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.91
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
 description: Itsi Server - A light-weight Rack Server implementation for Ruby
 email:
 - wc@pico.net.nz
@@ -63,36 +49,72 @@ files:
 - ".rubocop.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
+- Cargo.lock
+- Cargo.toml
 - LICENSE.txt
 - README.md
 - Rakefile
 - exe/itsi
 - ext/itsi_error/Cargo.lock
 - ext/itsi_error/Cargo.toml
+- ext/itsi_error/src/from.rs
 - ext/itsi_error/src/lib.rs
+- ext/itsi_instrument_entry/Cargo.toml
+- ext/itsi_instrument_entry/src/lib.rs
 - ext/itsi_rb_helpers/Cargo.lock
 - ext/itsi_rb_helpers/Cargo.toml
+- ext/itsi_rb_helpers/src/heap_value.rs
 - ext/itsi_rb_helpers/src/lib.rs
+- ext/itsi_scheduler/Cargo.toml
+- ext/itsi_scheduler/extconf.rb
+- ext/itsi_scheduler/src/itsi_scheduler.rs
+- ext/itsi_scheduler/src/itsi_scheduler/io_helpers.rs
+- ext/itsi_scheduler/src/itsi_scheduler/io_waiter.rs
+- ext/itsi_scheduler/src/itsi_scheduler/timer.rs
+- ext/itsi_scheduler/src/lib.rs
+- ext/itsi_server/Cargo.lock
 - ext/itsi_server/Cargo.toml
 - ext/itsi_server/extconf.rb
+- ext/itsi_server/src/body_proxy/big_bytes.rs
+- ext/itsi_server/src/body_proxy/itsi_body_proxy.rs
+- ext/itsi_server/src/body_proxy/mod.rs
+- ext/itsi_server/src/env.rs
 - ext/itsi_server/src/lib.rs
 - ext/itsi_server/src/request/itsi_request.rs
 - ext/itsi_server/src/request/mod.rs
+- ext/itsi_server/src/response/itsi_response.rs
+- ext/itsi_server/src/response/mod.rs
 - ext/itsi_server/src/server/bind.rs
-- ext/itsi_server/src/server/itsi_ca/itsi_ca.crt
-- ext/itsi_server/src/server/itsi_ca/itsi_ca.key
+- ext/itsi_server/src/server/bind_protocol.rs
+- ext/itsi_server/src/server/io_stream.rs
 - ext/itsi_server/src/server/itsi_server.rs
+- ext/itsi_server/src/server/lifecycle_event.rs
 - ext/itsi_server/src/server/listener.rs
 - ext/itsi_server/src/server/mod.rs
+- ext/itsi_server/src/server/process_worker.rs
+- ext/itsi_server/src/server/serve_strategy/cluster_mode.rs
+- ext/itsi_server/src/server/serve_strategy/mod.rs
+- ext/itsi_server/src/server/serve_strategy/single_mode.rs
+- ext/itsi_server/src/server/signal.rs
+- ext/itsi_server/src/server/thread_worker.rs
 - ext/itsi_server/src/server/tls.rs
-- ext/itsi_server/src/server/transfer_protocol.rs
-- ext/itsi_server/src/stream_writer/mod.rs
+- ext/itsi_server/src/server/tls/locked_dir_cache.rs
 - ext/itsi_tracing/Cargo.lock
 - ext/itsi_tracing/Cargo.toml
 - ext/itsi_tracing/src/lib.rs
+- lib/itsi/index.html
 - lib/itsi/request.rb
 - lib/itsi/server.rb
+- lib/itsi/server/Itsi.rb
+- lib/itsi/server/config.rb
+- lib/itsi/server/options_dsl.rb
+- lib/itsi/server/rack/handler/itsi.rb
+- lib/itsi/server/rack_interface.rb
+- lib/itsi/server/scheduler_interface.rb
+- lib/itsi/server/scheduler_mode.rb
+- lib/itsi/server/signal_trap.rb
 - lib/itsi/server/version.rb
+- lib/itsi/stream_io.rb
 - sig/itsi_server.rbs
 homepage: https://itsi.fyi
 licenses:
@@ -108,12 +130,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.1.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.3.11
+      version: '3.1'
 requirements: []
 rubygems_version: 3.6.2
 specification_version: 4

data/ext/itsi_server/src/server/itsi_ca/itsi_ca.crt

@@ -1,32 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFgTCCA2mgAwIBAgIUe316+G3qdkcWtRxYKlNBEAEenzAwDQYJKoZIhvcNAQEL
-BQAwUDELMAkGA1UEBhMCVVMxDTALBgNVBAgMBEl0c2kxDTALBgNVBAcMBEl0c2kx
-EDAOBgNVBAoMB0l0c2kgQ0ExETAPBgNVBAMMCGl0c2kuZnlpMB4XDTI1MDIyODAy
-NTkyNVoXDTM1MDIyNjAyNTkyNVowUDELMAkGA1UEBhMCVVMxDTALBgNVBAgMBEl0
-c2kxDTALBgNVBAcMBEl0c2kxEDAOBgNVBAoMB0l0c2kgQ0ExETAPBgNVBAMMCGl0
-c2kuZnlpMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAzKAK2RIvnATa
-pOxNYubaGjOx8z4thxwWM/KxMqI8gABmgRFTa99n1vrTenlfdX4PcoRyCXEJ3krh
-nPsRmP1nnUS1BEIX4Ha9xVPIy0UoP0JN1a4kVInejZe2ZTcpRv8k2KlkafIw0ISt
-/hSoopNV2SESCMDxx2e3F9d4wzHmkfs2+6k+12TTYkkifXaXgSOXm91a5ABqTfa8
-wS6td/zmwv6W5RNBU3kS3TsqoKjc0xdu25aifJ40i/+82b5OOWhWt+psSPlTZb+Y
-5elMhlh8Hjs52S3u48wz5joPsBi9r4yLYGhgB+AiW+b+y0uss7EiTQR24U+CroEB
-4c1LA4qTgQPUvUIXyyFGC3lPsjKHGiEitbIT4sDQOz3nMMvT0FIP7DPtiSAuyx0I
-J6/3+/QQ/8dzGqZskolKTSWGToOysNWcIxbbBprDAXYseOTJvREVpwC/Qra5OUqU
-6P8K72yp2hSCu/5EQwV3kwKMw0JmjJFyaL8SC2GJnueWWCIIZjYdc0ZAA9Dvl9eo
-SfQA4emLjUcScFpj8kv3Iu5tGJxnO1gqJ4JV+NKJ/09AxXvFYpNhaBXJ0xUOTA8/
-vBTkAs9hTFV1IFIgJNP5CxEbkWr5FcFYUKAopFhDKfQkXGCKEn4s3wuNqUuzEEdE
-Sx2YVV8XKbb9eKpHN5cQ6ljeFvanKpMCAwEAAaNTMFEwHQYDVR0OBBYEFIaKuU5Z
-CCv9JAsdqvHyR5QnE1OdMB8GA1UdIwQYMBaAFIaKuU5ZCCv9JAsdqvHyR5QnE1Od
-MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBAGslKyiOzrJzfVEA
-HwJu/4CpDs7MpZuzAJ/AS0shWR3qlpHJUn6c/NIaQBfmVIo+vfxTvwV+ih6tZ+4A
-HmIZrCQm7rn5uQm2Q9G++JQ0RgQfLngnz3FBL+aERW2wxw1vOcPwg8JWCeGUSCd4
-Lj4jtpvlniS5uIiCD2GYxRIub401egX60XAiHdR0k6rS2dKxab9vMKW28RvRddak
-YCk7UKSXOZlj39XVH/JCB8+4IokDLTikpoAUqiNfytO+kx9+1JHKti8NjSQJwjqO
-JtBd1OD2ziQqd0gVKjr3J4IwIBv3Yl3GGUi3c5HVyDejriPciPrK+4G6a4IDGiyG
-rQRTzTR98ILsPX5uvOJadF1TAyZpS8oN7xFM8BnKfdpB34x3p9KgBqk34dRIXxbF
-nM3AJRT5dHlcHkn6z1snFqRHko4QvG0bSHlZFepogLG9yOGB0B1Hp4JPTSimEb6f
-b+CL5o8mXzAMRDIzdjTkBM/nQg5NMoXaXvmKypw/zIYI/ffb6Kwu/Y6gWmXubQrA
-fJ95Ssb14RKtmW6IDmHD5mNpybjhoSzwtBZyuHAyVZT/5P8/QHNkMBwpfQsevY5f
-FmOcAZIq9bHTBvn5SNNvi2NxZfTRD7sTMogXgqKKcxwe2rs52IYecamNekQMjrPL
-jI16bCLO/G1NaQ+N9YFL4TGfvbCe
------END CERTIFICATE-----

data/ext/itsi_server/src/server/itsi_ca/itsi_ca.key

@@ -1,52 +0,0 @@
------BEGIN PRIVATE KEY-----
-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
-cN5973/E4MpAKMt1shs0YWr3axraOhkg
------END PRIVATE KEY-----

data/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/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(())
-    }
-}