spikard 0.6.2 → 0.7.2

data/vendor/crates/spikard-rb/src/websocket.rs

@@ -3,7 +3,7 @@
 //! This module provides the bridge between Ruby blocks/procs and Rust's WebSocket system.
 //! Uses magnus to safely call Ruby code from Rust async tasks.
 
-use magnus::{RHash, Value, prelude::*, value::Opaque};
+use magnus::{RHash, Ruby, Value, prelude::*, value::Opaque};
 use serde_json::Value as JsonValue;
 use spikard_http::WebSocketHandler;
 use std::sync::mpsc;
@@ -39,6 +39,12 @@ enum WebSocketWorkItem {
     Shutdown,
 }
 
+enum WebSocketFactoryWorkItem {
+    Build {
+        reply: mpsc::Sender<Result<RubyWebSocketHandler, String>>,
+    },
+}
+
 impl RubyWebSocketHandler {
     /// Create a new Ruby WebSocket handler
     #[allow(dead_code)]
@@ -137,6 +143,33 @@ impl RubyWebSocketHandler {
             }
         }
     }
+
+    fn from_handler(ruby: &Ruby, handler_obj: Value) -> Result<Self, magnus::Error> {
+        let handle_message_proc: Value = handler_obj
+            .funcall("method", (ruby.to_symbol("handle_message"),))
+            .map_err(|e| {
+                magnus::Error::new(
+                    ruby.exception_arg_error(),
+                    format!("handle_message method not found: {}", e),
+                )
+            })?;
+
+        let on_connect_proc = handler_obj
+            .funcall::<_, _, Value>("method", (ruby.to_symbol("on_connect"),))
+            .ok();
+
+        let on_disconnect_proc = handler_obj
+            .funcall::<_, _, Value>("method", (ruby.to_symbol("on_disconnect"),))
+            .ok();
+
+        Ok(Self::new(
+            ruby,
+            "WebSocketHandler".to_string(),
+            handle_message_proc,
+            on_connect_proc,
+            on_disconnect_proc,
+        ))
+    }
 }
 
 impl WebSocketHandler for RubyWebSocketHandler {
@@ -319,26 +352,16 @@ unsafe impl Sync for RubyWebSocketHandler {}
 #[allow(dead_code)]
 pub fn create_websocket_state(
     ruby: &magnus::Ruby,
-    handler_obj: Value,
+    handler_factory: Value,
 ) -> Result<spikard_http::WebSocketState<RubyWebSocketHandler>, magnus::Error> {
-    let handle_message_proc: Value = handler_obj
-        .funcall("method", (ruby.to_symbol("handle_message"),))
-        .map_err(|e| {
-            magnus::Error::new(
-                ruby.exception_arg_error(),
-                format!("handle_message method not found: {}", e),
-            )
-        })?;
-
-    let on_connect_proc = handler_obj
-        .funcall::<_, _, Value>("method", (ruby.to_symbol("on_connect"),))
-        .ok();
-
-    let on_disconnect_proc = handler_obj
-        .funcall::<_, _, Value>("method", (ruby.to_symbol("on_disconnect"),))
-        .ok();
-
-    let message_schema = handler_obj
+    let handler_instance: Value = handler_factory.funcall("call", ()).map_err(|e| {
+        magnus::Error::new(
+            ruby.exception_runtime_error(),
+            format!("Failed to create WebSocket handler: {}", e),
+        )
+    })?;
+
+    let message_schema = handler_instance
         .funcall::<_, _, Value>("instance_variable_get", (ruby.to_symbol("@_message_schema"),))
         .ok()
         .and_then(|v| {
@@ -349,7 +372,7 @@ pub fn create_websocket_state(
             }
         });
 
-    let response_schema = handler_obj
+    let response_schema = handler_instance
         .funcall::<_, _, Value>("instance_variable_get", (ruby.to_symbol("@_response_schema"),))
         .ok()
         .and_then(|v| {
@@ -360,18 +383,84 @@ pub fn create_websocket_state(
             }
         });
 
-    let ruby_handler = RubyWebSocketHandler::new(
-        ruby,
-        "WebSocketHandler".to_string(),
-        handle_message_proc,
-        on_connect_proc,
-        on_disconnect_proc,
-    );
+    let handler_factory = Opaque::from(handler_factory);
+    let (factory_tx, factory_rx) = mpsc::channel();
+
+    let handler_factory_for_thread = handler_factory;
+    ruby.thread_create_from_fn(move |ruby| {
+        websocket_factory_worker_loop(ruby, handler_factory_for_thread, factory_rx);
+        ruby.qnil()
+    });
+
+    let handler_builder = move || {
+        let (reply_tx, reply_rx) = mpsc::channel();
+        if factory_tx
+            .send(WebSocketFactoryWorkItem::Build { reply: reply_tx })
+            .is_err()
+        {
+            return Err("WebSocket handler factory thread closed".to_string());
+        }
+        if magnus::Ruby::get().is_ok() {
+            let reply_rx_ref = &reply_rx;
+            let result = crate::call_without_gvl!(
+                recv_factory_reply,
+                args: (reply_rx_ref, &mpsc::Receiver<Result<RubyWebSocketHandler, String>>),
+                return_type: Option<Result<RubyWebSocketHandler, String>>
+            );
+            result.ok_or_else(|| "WebSocket handler factory response channel closed".to_string())?
+        } else {
+            reply_rx
+                .recv()
+                .map_err(|_| "WebSocket handler factory response channel closed".to_string())?
+        }
+    };
 
     if message_schema.is_some() || response_schema.is_some() {
-        spikard_http::WebSocketState::with_schemas(ruby_handler, message_schema, response_schema)
+        spikard_http::WebSocketState::with_factory(handler_builder, message_schema, response_schema)
             .map_err(|e| magnus::Error::new(ruby.exception_runtime_error(), e))
     } else {
-        Ok(spikard_http::WebSocketState::new(ruby_handler))
+        spikard_http::WebSocketState::with_factory(handler_builder, None, None)
+            .map_err(|e| magnus::Error::new(ruby.exception_runtime_error(), e))
     }
 }
+
+fn websocket_factory_worker_loop(
+    ruby: &magnus::Ruby,
+    handler_factory: Opaque<Value>,
+    work_rx: mpsc::Receiver<WebSocketFactoryWorkItem>,
+) {
+    let work_rx_ref = &work_rx;
+    loop {
+        let work = crate::call_without_gvl!(
+            recv_factory_item,
+            args: (work_rx_ref, &mpsc::Receiver<WebSocketFactoryWorkItem>),
+            return_type: Option<WebSocketFactoryWorkItem>
+        );
+        let Some(work) = work else {
+            break;
+        };
+
+        match work {
+            WebSocketFactoryWorkItem::Build { reply } => {
+                let result = (|| {
+                    let factory_value = ruby.get_inner(handler_factory);
+                    let handler_instance: Value = factory_value
+                        .funcall("call", ())
+                        .map_err(|e| format!("Failed to create WebSocket handler: {}", e))?;
+                    RubyWebSocketHandler::from_handler(ruby, handler_instance).map_err(|e| e.to_string())
+                })();
+                let _ = reply.send(result);
+            }
+        }
+    }
+}
+
+fn recv_factory_item(receiver: &mpsc::Receiver<WebSocketFactoryWorkItem>) -> Option<WebSocketFactoryWorkItem> {
+    receiver.recv().ok()
+}
+
+fn recv_factory_reply(
+    receiver: &mpsc::Receiver<Result<RubyWebSocketHandler, String>>,
+) -> Option<Result<RubyWebSocketHandler, String>> {
+    receiver.recv().ok()
+}

data/vendor/crates/spikard-rb-macros/Cargo.toml

@@ -0,0 +1,14 @@
+[package]
+name = "spikard-rb-macros"
+version = "0.7.2"
+edition = "2024"
+license = "MIT"
+publish = false
+
+[lib]
+proc-macro = true
+
+[dependencies]
+proc-macro2 = "1"
+quote = "1"
+syn = { version = "2", features = ["full"] }

data/vendor/crates/spikard-rb-macros/src/lib.rs

@@ -0,0 +1,52 @@
+use proc_macro::TokenStream;
+use quote::quote;
+use syn::{FnArg, ItemFn, parse_macro_input};
+
+#[proc_macro_attribute]
+pub fn without_gvl(_attr: TokenStream, item: TokenStream) -> TokenStream {
+    let input = parse_macro_input!(item as ItemFn);
+    let attrs = &input.attrs;
+    let vis = &input.vis;
+    let sig = &input.sig;
+    let mut anon_sig = sig.clone();
+    anon_sig.ident = syn::Ident::new("__anon_wrapper", sig.ident.span());
+
+    let params = sig.inputs.iter().map(|arg| match arg {
+        FnArg::Typed(pat) => {
+            let arg = &pat.pat;
+            let ty = &pat.ty;
+            quote!(#arg, #ty)
+        }
+        FnArg::Receiver(recv) => {
+            let ty = if let Some((_and, lifetime)) = &recv.reference {
+                let mutability = recv.mutability;
+                if let Some(lifetime) = lifetime {
+                    quote!(&#lifetime #mutability Self)
+                } else {
+                    quote!(& #mutability Self)
+                }
+            } else {
+                quote!(Self)
+            };
+            quote!(self, #ty)
+        }
+    });
+
+    let return_ty = match &sig.output {
+        syn::ReturnType::Default => quote!(()),
+        syn::ReturnType::Type(_, ty) => quote!(#ty),
+    };
+
+    let block = &input.block;
+
+    quote!(
+        #(#attrs)*
+        #vis #sig {
+            #anon_sig {
+                #block
+            }
+            crate::call_without_gvl!(__anon_wrapper, args: (#(#params),*), return_type: #return_ty)
+        }
+    )
+    .into()
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spikard
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.2
 platform: ruby
 authors:
 - Na'aman Hirschfeld
@@ -62,6 +62,7 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
+- ext/spikard_rb/Cargo.lock
 - ext/spikard_rb/Cargo.toml
 - ext/spikard_rb/extconf.rb
 - ext/spikard_rb/src/lib.rs
@@ -97,6 +98,7 @@ files:
 - vendor/crates/spikard-bindings-shared/src/test_client_base.rs
 - vendor/crates/spikard-bindings-shared/src/validation_helpers.rs
 - vendor/crates/spikard-bindings-shared/tests/comprehensive_coverage.rs
+- vendor/crates/spikard-bindings-shared/tests/config_extractor_behavior.rs
 - vendor/crates/spikard-bindings-shared/tests/error_response_edge_cases.rs
 - vendor/crates/spikard-bindings-shared/tests/handler_base_integration.rs
 - vendor/crates/spikard-core/Cargo.toml
@@ -124,6 +126,15 @@ files:
 - vendor/crates/spikard-core/src/type_hints.rs
 - vendor/crates/spikard-core/src/validation/error_mapper.rs
 - vendor/crates/spikard-core/src/validation/mod.rs
+- vendor/crates/spikard-core/tests/bindings_response_tests.rs
+- vendor/crates/spikard-core/tests/di_dependency_defaults.rs
+- vendor/crates/spikard-core/tests/error_mapper.rs
+- vendor/crates/spikard-core/tests/parameters_edge_cases.rs
+- vendor/crates/spikard-core/tests/parameters_full.rs
+- vendor/crates/spikard-core/tests/parameters_schema_and_formats.rs
+- vendor/crates/spikard-core/tests/request_data_roundtrip.rs
+- vendor/crates/spikard-core/tests/validation_coverage.rs
+- vendor/crates/spikard-core/tests/validation_error_paths.rs
 - vendor/crates/spikard-http/Cargo.toml
 - vendor/crates/spikard-http/examples/sse-notifications.rs
 - vendor/crates/spikard-http/examples/websocket-chat.rs
@@ -138,6 +149,11 @@ files:
 - vendor/crates/spikard-http/src/handler_response.rs
 - vendor/crates/spikard-http/src/handler_trait.rs
 - vendor/crates/spikard-http/src/handler_trait_tests.rs
+- vendor/crates/spikard-http/src/jsonrpc/http_handler.rs
+- vendor/crates/spikard-http/src/jsonrpc/method_registry.rs
+- vendor/crates/spikard-http/src/jsonrpc/mod.rs
+- vendor/crates/spikard-http/src/jsonrpc/protocol.rs
+- vendor/crates/spikard-http/src/jsonrpc/router.rs
 - vendor/crates/spikard-http/src/lib.rs
 - vendor/crates/spikard-http/src/lifecycle.rs
 - vendor/crates/spikard-http/src/lifecycle/adapter.rs
@@ -162,16 +178,41 @@ files:
 - vendor/crates/spikard-http/src/testing/multipart.rs
 - vendor/crates/spikard-http/src/testing/test_client.rs
 - vendor/crates/spikard-http/src/websocket.rs
+- vendor/crates/spikard-http/tests/auth_integration.rs
 - vendor/crates/spikard-http/tests/background_behavior.rs
 - vendor/crates/spikard-http/tests/common/handlers.rs
 - vendor/crates/spikard-http/tests/common/mod.rs
+- vendor/crates/spikard-http/tests/common/test_builders.rs
+- vendor/crates/spikard-http/tests/di_handler_error_responses.rs
 - vendor/crates/spikard-http/tests/di_integration.rs
 - vendor/crates/spikard-http/tests/doc_snippets.rs
 - vendor/crates/spikard-http/tests/lifecycle_execution.rs
+- vendor/crates/spikard-http/tests/middleware_stack_integration.rs
 - vendor/crates/spikard-http/tests/multipart_behavior.rs
+- vendor/crates/spikard-http/tests/request_extraction_full.rs
+- vendor/crates/spikard-http/tests/server_auth_middleware_behavior.rs
 - vendor/crates/spikard-http/tests/server_config_builder.rs
+- vendor/crates/spikard-http/tests/server_configured_router_behavior.rs
+- vendor/crates/spikard-http/tests/server_cors_preflight.rs
+- vendor/crates/spikard-http/tests/server_handler_wrappers.rs
+- vendor/crates/spikard-http/tests/server_method_router_additional_behavior.rs
+- vendor/crates/spikard-http/tests/server_method_router_coverage.rs
+- vendor/crates/spikard-http/tests/server_middleware_behavior.rs
+- vendor/crates/spikard-http/tests/server_middleware_branches.rs
+- vendor/crates/spikard-http/tests/server_openapi_jsonrpc_static.rs
+- vendor/crates/spikard-http/tests/server_router_behavior.rs
 - vendor/crates/spikard-http/tests/sse_behavior.rs
+- vendor/crates/spikard-http/tests/sse_full_behavior.rs
+- vendor/crates/spikard-http/tests/sse_handler_behavior.rs
+- vendor/crates/spikard-http/tests/test_client_requests.rs
+- vendor/crates/spikard-http/tests/testing_helpers.rs
+- vendor/crates/spikard-http/tests/testing_module_coverage.rs
+- vendor/crates/spikard-http/tests/urlencoded_content_type.rs
 - vendor/crates/spikard-http/tests/websocket_behavior.rs
+- vendor/crates/spikard-http/tests/websocket_full_behavior.rs
+- vendor/crates/spikard-http/tests/websocket_integration.rs
+- vendor/crates/spikard-rb-macros/Cargo.toml
+- vendor/crates/spikard-rb-macros/src/lib.rs
 - vendor/crates/spikard-rb/Cargo.toml
 - vendor/crates/spikard-rb/build.rs
 - vendor/crates/spikard-rb/src/background.rs
@@ -180,12 +221,14 @@ files:
 - vendor/crates/spikard-rb/src/conversion.rs
 - vendor/crates/spikard-rb/src/di/builder.rs
 - vendor/crates/spikard-rb/src/di/mod.rs
+- vendor/crates/spikard-rb/src/gvl.rs
 - vendor/crates/spikard-rb/src/handler.rs
 - vendor/crates/spikard-rb/src/integration/mod.rs
 - vendor/crates/spikard-rb/src/lib.rs
 - vendor/crates/spikard-rb/src/lifecycle.rs
 - vendor/crates/spikard-rb/src/metadata/mod.rs
 - vendor/crates/spikard-rb/src/metadata/route_extraction.rs
+- vendor/crates/spikard-rb/src/request.rs
 - vendor/crates/spikard-rb/src/runtime/mod.rs
 - vendor/crates/spikard-rb/src/runtime/server_runner.rs
 - vendor/crates/spikard-rb/src/server.rs