itsi-server 0.2.7 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a903e132ef7c772c7774a05632d50cae7abb99ec7471fd7479c7c7b8ade1aadc
-  data.tar.gz: 35770b2f19bd1273cb05dba7c4369ec416878175d53a87c45d425c2841d73e84
+  metadata.gz: 7de2dcacb42a3cad9986346e2acf704398e8fa5ea914c2c3172567426905b1fb
+  data.tar.gz: b3b899916642adc30083e4743dbf063431f6de66814e32fd078559f84f437c23
 SHA512:
-  metadata.gz: a838b6d7d5abd5449775a31ad6be9e6323578a677eb44ce9f4c6d938601d3a8d9a6df2aa5fe7749078c2047a8e75f716f22f84d65ad95027f19abd2fb3007110
-  data.tar.gz: 36d205941ce61387b99e98897661fdc6843ec978959e90d69ae16d45ae6255d3560585586aa244c86281c903fd60ba46fb1dd26087383ece81ed0ec6caa9055e
+  metadata.gz: 9f2c16a266cdeee4d70b735c9a0f63448a453a06e56aadc18ddcf5f64218c219df882e5d39961d3e77b1edd757d63117da2e5b8a60dc854b50e13e9f14f52e21
+  data.tar.gz: e1d71d18956970cf5c7a8ccad1e766d7266428040acef89f3d032773ebcdcfa79fa872cf741ca26de26b0e87203565390720b2c74ac89e0e783a8267199ccca3

data/Cargo.lock

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

data/ext/itsi_scheduler/Cargo.toml

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

data/ext/itsi_scheduler/src/itsi_scheduler.rs

@@ -7,7 +7,7 @@ use itsi_error::ItsiError;
 use itsi_rb_helpers::{call_without_gvl, create_ruby_thread};
 use magnus::{
     error::Result as MagnusResult,
-    value::{InnerValue, Opaque, ReprValue},
+    value::{InnerValue, Lazy, LazyId, Opaque, ReprValue},
     Module, RClass, Ruby, Value,
 };
 use mio::{Events, Poll, Token, Waker};
@@ -19,7 +19,7 @@ use std::{
     time::Duration,
 };
 use timer::Timer;
-use tracing::{debug, info, warn};
+use tracing::{debug, error, info, warn};
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub(crate) struct Readiness(i16);
@@ -31,6 +31,9 @@ impl std::fmt::Debug for ItsiScheduler {
 }
 
 const WAKE_TOKEN: Token = Token(0);
+static ID_CURRENT: LazyId = LazyId::new("current");
+static CLASS_FIBER: Lazy<RClass> =
+    Lazy::new(|ruby| ruby.module_kernel().const_get("Fiber").unwrap());
 
 #[magnus::wrap(class = "Itsi::Scheduler", free_immediately, size)]
 pub(crate) struct ItsiScheduler {
@@ -225,14 +228,17 @@ impl ItsiScheduler {
         let result: Arc<RwLock<Option<T>>> = Arc::new(RwLock::new(None));
         let result_clone = Arc::clone(&result);
 
-        let current_fiber = Opaque::from(ruby.fiber_current());
-        let scheduler = Opaque::from(
-            ruby.module_kernel()
-                .const_get::<_, RClass>("Fiber")
-                .unwrap()
-                .funcall::<_, _, Value>("scheduler", ())
-                .unwrap(),
-        );
+        let class_fiber = ruby.get_inner(&CLASS_FIBER);
+        let current_fiber = ruby
+            .get_inner(&CLASS_FIBER)
+            .funcall::<_, _, Value>(*ID_CURRENT, ());
+
+        if current_fiber.is_err() {
+            error!("Failed to get current fiber");
+            return Err(ItsiError::ArgumentError("Failed to get current fiber".to_string()).into());
+        }
+        let current_fiber = Opaque::from(current_fiber.unwrap());
+        let scheduler = Opaque::from(class_fiber.funcall::<_, _, Value>("scheduler", ()).unwrap());
 
         create_ruby_thread(move || {
             call_without_gvl(|| {

data/ext/itsi_server/Cargo.toml

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

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

@@ -108,16 +108,13 @@ impl HttpRequestContext {
     }
 
     pub fn set_supported_encoding_set(&self, req: &HttpRequest) {
-        let supported_encoding_set = req
-            .headers()
-            .get_all(ACCEPT_ENCODING)
-            .into_iter()
-            .cloned()
-            .collect::<Vec<_>>();
-        self.inner
-            .supported_encoding_set
-            .set(supported_encoding_set)
-            .unwrap();
+        self.inner.supported_encoding_set.get_or_init(move || {
+            req.headers()
+                .get_all(ACCEPT_ENCODING)
+                .into_iter()
+                .cloned()
+                .collect::<Vec<_>>()
+        });
     }
 
     pub fn set_origin(&self, origin: Option<String>) {

data/lib/itsi/server/config/config_helpers.rb

@@ -42,7 +42,16 @@ module Itsi
         end
 
         def self.included(cls) # rubocop:disable Metrics/PerceivedComplexity,Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength
+
+          class << cls
+            def subclasses
+              @subclasses ||= []
+            end
+          end
+
           def cls.inherited(base) # rubocop:disable Metrics/MethodLength,Lint/MissingSuper,Metrics/PerceivedComplexity
+            self.subclasses << base
+
             %i[detail documentation insert_text schema].each do |attr|
               base.define_singleton_method(attr) do |value = nil|
                 @middleware_class_attrs ||= {}

data/lib/itsi/server/config.rb

@@ -35,6 +35,7 @@ module Itsi
       # 3. Default values.
       def self.build_config(args, config_file_path, builder_proc = nil)
         args.transform_keys!(&:to_sym)
+
         itsifile_config, errors = \
           if builder_proc
             DSL.evaluate(&builder_proc)
@@ -105,6 +106,7 @@ module Itsi
           Server.write_pid
         end
 
+
         srv_config = {
           workers: args.fetch(:workers) { itsifile_config.fetch(:workers, 1) },
           worker_memory_limit: args.fetch(:worker_memory_limit) { itsifile_config.fetch(:worker_memory_limit, nil) },

data/lib/itsi/server/version.rb

@@ -2,6 +2,6 @@
 
 module Itsi
   class Server
-    VERSION = "0.2.7"
+    VERSION = "0.2.9"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: itsi-server
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.9
 platform: ruby
 authors:
 - Wouter Coppieters
@@ -51,6 +51,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.91
+- !ruby/object:Gem::Dependency
+  name: prism
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: ruby-lsp
   requirement: !ruby/object:Gem::Requirement