spikard 0.6.2 → 0.7.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/README.md +90 -508
- data/ext/spikard_rb/Cargo.lock +3287 -0
- data/ext/spikard_rb/Cargo.toml +1 -1
- data/ext/spikard_rb/extconf.rb +3 -3
- data/lib/spikard/app.rb +72 -49
- data/lib/spikard/background.rb +38 -7
- data/lib/spikard/testing.rb +42 -4
- data/lib/spikard/version.rb +1 -1
- data/sig/spikard.rbs +4 -0
- data/vendor/crates/spikard-bindings-shared/Cargo.toml +1 -1
- data/vendor/crates/spikard-bindings-shared/tests/config_extractor_behavior.rs +191 -0
- data/vendor/crates/spikard-core/Cargo.toml +1 -1
- data/vendor/crates/spikard-core/src/http.rs +1 -0
- data/vendor/crates/spikard-core/src/lifecycle.rs +63 -0
- data/vendor/crates/spikard-core/tests/bindings_response_tests.rs +136 -0
- data/vendor/crates/spikard-core/tests/di_dependency_defaults.rs +37 -0
- data/vendor/crates/spikard-core/tests/error_mapper.rs +761 -0
- data/vendor/crates/spikard-core/tests/parameters_edge_cases.rs +106 -0
- data/vendor/crates/spikard-core/tests/parameters_full.rs +701 -0
- data/vendor/crates/spikard-core/tests/parameters_schema_and_formats.rs +301 -0
- data/vendor/crates/spikard-core/tests/request_data_roundtrip.rs +67 -0
- data/vendor/crates/spikard-core/tests/validation_coverage.rs +250 -0
- data/vendor/crates/spikard-core/tests/validation_error_paths.rs +45 -0
- data/vendor/crates/spikard-http/Cargo.toml +1 -1
- data/vendor/crates/spikard-http/src/jsonrpc/http_handler.rs +502 -0
- data/vendor/crates/spikard-http/src/jsonrpc/method_registry.rs +648 -0
- data/vendor/crates/spikard-http/src/jsonrpc/mod.rs +58 -0
- data/vendor/crates/spikard-http/src/jsonrpc/protocol.rs +1207 -0
- data/vendor/crates/spikard-http/src/jsonrpc/router.rs +2262 -0
- data/vendor/crates/spikard-http/src/testing/test_client.rs +155 -2
- data/vendor/crates/spikard-http/src/testing.rs +171 -0
- data/vendor/crates/spikard-http/src/websocket.rs +79 -6
- data/vendor/crates/spikard-http/tests/auth_integration.rs +647 -0
- data/vendor/crates/spikard-http/tests/common/test_builders.rs +633 -0
- data/vendor/crates/spikard-http/tests/di_handler_error_responses.rs +162 -0
- data/vendor/crates/spikard-http/tests/middleware_stack_integration.rs +389 -0
- data/vendor/crates/spikard-http/tests/request_extraction_full.rs +513 -0
- data/vendor/crates/spikard-http/tests/server_auth_middleware_behavior.rs +244 -0
- data/vendor/crates/spikard-http/tests/server_configured_router_behavior.rs +200 -0
- data/vendor/crates/spikard-http/tests/server_cors_preflight.rs +82 -0
- data/vendor/crates/spikard-http/tests/server_handler_wrappers.rs +464 -0
- data/vendor/crates/spikard-http/tests/server_method_router_additional_behavior.rs +286 -0
- data/vendor/crates/spikard-http/tests/server_method_router_coverage.rs +118 -0
- data/vendor/crates/spikard-http/tests/server_middleware_behavior.rs +99 -0
- data/vendor/crates/spikard-http/tests/server_middleware_branches.rs +206 -0
- data/vendor/crates/spikard-http/tests/server_openapi_jsonrpc_static.rs +281 -0
- data/vendor/crates/spikard-http/tests/server_router_behavior.rs +121 -0
- data/vendor/crates/spikard-http/tests/sse_full_behavior.rs +584 -0
- data/vendor/crates/spikard-http/tests/sse_handler_behavior.rs +130 -0
- data/vendor/crates/spikard-http/tests/test_client_requests.rs +167 -0
- data/vendor/crates/spikard-http/tests/testing_helpers.rs +87 -0
- data/vendor/crates/spikard-http/tests/testing_module_coverage.rs +156 -0
- data/vendor/crates/spikard-http/tests/urlencoded_content_type.rs +82 -0
- data/vendor/crates/spikard-http/tests/websocket_full_behavior.rs +440 -0
- data/vendor/crates/spikard-http/tests/websocket_integration.rs +152 -0
- data/vendor/crates/spikard-rb/Cargo.toml +1 -1
- data/vendor/crates/spikard-rb/src/gvl.rs +80 -0
- data/vendor/crates/spikard-rb/src/handler.rs +12 -9
- data/vendor/crates/spikard-rb/src/lib.rs +137 -124
- data/vendor/crates/spikard-rb/src/request.rs +342 -0
- data/vendor/crates/spikard-rb/src/runtime/server_runner.rs +1 -8
- data/vendor/crates/spikard-rb/src/server.rs +1 -8
- data/vendor/crates/spikard-rb/src/testing/client.rs +168 -9
- data/vendor/crates/spikard-rb/src/websocket.rs +119 -30
- data/vendor/crates/spikard-rb-macros/Cargo.toml +14 -0
- data/vendor/crates/spikard-rb-macros/src/lib.rs +52 -0
- metadata +44 -1
|
@@ -0,0 +1,648 @@
|
|
|
1
|
+
//! JSON-RPC method registry for handler registration and lookup
|
|
2
|
+
//!
|
|
3
|
+
//! This module provides thread-safe registration and retrieval of JSON-RPC methods
|
|
4
|
+
//! with their associated handlers and metadata.
|
|
5
|
+
|
|
6
|
+
use crate::handler_trait::Handler;
|
|
7
|
+
use serde::{Deserialize, Serialize};
|
|
8
|
+
use serde_json::Value;
|
|
9
|
+
use std::collections::HashMap;
|
|
10
|
+
use std::fmt;
|
|
11
|
+
use std::sync::{Arc, RwLock};
|
|
12
|
+
|
|
13
|
+
/// Error type for registry operations that involve lock acquisition
|
|
14
|
+
#[derive(Debug, Clone)]
|
|
15
|
+
pub struct RegistryError {
|
|
16
|
+
/// Description of the error
|
|
17
|
+
message: String,
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
impl RegistryError {
|
|
21
|
+
/// Create a lock poisoning error
|
|
22
|
+
fn lock_poisoned() -> Self {
|
|
23
|
+
Self {
|
|
24
|
+
message: "Failed to acquire lock on registry: lock was poisoned due to a previous panic".to_string(),
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
impl fmt::Display for RegistryError {
|
|
30
|
+
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
|
31
|
+
write!(f, "{}", self.message)
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
impl std::error::Error for RegistryError {}
|
|
36
|
+
|
|
37
|
+
/// Example for a JSON-RPC method
|
|
38
|
+
#[derive(Debug, Clone, Serialize, Deserialize)]
|
|
39
|
+
pub struct MethodExample {
|
|
40
|
+
/// Name of the example
|
|
41
|
+
pub name: String,
|
|
42
|
+
/// Optional description of the example
|
|
43
|
+
pub description: Option<String>,
|
|
44
|
+
/// Example parameters
|
|
45
|
+
pub params: Value,
|
|
46
|
+
/// Example result
|
|
47
|
+
pub result: Value,
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
/// Metadata for a JSON-RPC method
|
|
51
|
+
#[derive(Debug, Clone, Serialize, Deserialize)]
|
|
52
|
+
pub struct MethodMetadata {
|
|
53
|
+
/// Method name
|
|
54
|
+
pub name: String,
|
|
55
|
+
/// Optional description of what the method does
|
|
56
|
+
pub description: Option<String>,
|
|
57
|
+
/// JSON Schema for method parameters
|
|
58
|
+
pub params_schema: Option<Value>,
|
|
59
|
+
/// JSON Schema for method result
|
|
60
|
+
pub result_schema: Option<Value>,
|
|
61
|
+
/// JSON Schema for method errors
|
|
62
|
+
pub error_schema: Option<Value>,
|
|
63
|
+
/// Examples for this method
|
|
64
|
+
pub examples: Vec<MethodExample>,
|
|
65
|
+
/// Whether this method is deprecated
|
|
66
|
+
pub deprecated: bool,
|
|
67
|
+
/// Tags for organizing/categorizing methods
|
|
68
|
+
pub tags: Vec<String>,
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
impl MethodMetadata {
|
|
72
|
+
/// Create a new MethodMetadata with minimal required fields
|
|
73
|
+
///
|
|
74
|
+
/// # Arguments
|
|
75
|
+
///
|
|
76
|
+
/// * `name` - The method name
|
|
77
|
+
pub fn new(name: impl Into<String>) -> Self {
|
|
78
|
+
Self {
|
|
79
|
+
name: name.into(),
|
|
80
|
+
description: None,
|
|
81
|
+
params_schema: None,
|
|
82
|
+
result_schema: None,
|
|
83
|
+
error_schema: None,
|
|
84
|
+
examples: Vec::new(),
|
|
85
|
+
deprecated: false,
|
|
86
|
+
tags: Vec::new(),
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
|
|
90
|
+
/// Set the description for this method
|
|
91
|
+
pub fn with_description(mut self, description: impl Into<String>) -> Self {
|
|
92
|
+
self.description = Some(description.into());
|
|
93
|
+
self
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
/// Set the parameters schema for this method
|
|
97
|
+
pub fn with_params_schema(mut self, schema: Value) -> Self {
|
|
98
|
+
self.params_schema = Some(schema);
|
|
99
|
+
self
|
|
100
|
+
}
|
|
101
|
+
|
|
102
|
+
/// Set the result schema for this method
|
|
103
|
+
pub fn with_result_schema(mut self, schema: Value) -> Self {
|
|
104
|
+
self.result_schema = Some(schema);
|
|
105
|
+
self
|
|
106
|
+
}
|
|
107
|
+
|
|
108
|
+
/// Set the error schema for this method
|
|
109
|
+
pub fn with_error_schema(mut self, schema: Value) -> Self {
|
|
110
|
+
self.error_schema = Some(schema);
|
|
111
|
+
self
|
|
112
|
+
}
|
|
113
|
+
|
|
114
|
+
/// Add an example to this method's examples
|
|
115
|
+
pub fn with_example(mut self, example: MethodExample) -> Self {
|
|
116
|
+
self.examples.push(example);
|
|
117
|
+
self
|
|
118
|
+
}
|
|
119
|
+
|
|
120
|
+
/// Mark this method as deprecated
|
|
121
|
+
pub fn mark_deprecated(mut self) -> Self {
|
|
122
|
+
self.deprecated = true;
|
|
123
|
+
self
|
|
124
|
+
}
|
|
125
|
+
|
|
126
|
+
/// Add a tag to this method
|
|
127
|
+
pub fn with_tag(mut self, tag: impl Into<String>) -> Self {
|
|
128
|
+
self.tags.push(tag.into());
|
|
129
|
+
self
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
|
|
133
|
+
/// Type alias for handler and metadata pair
|
|
134
|
+
type MethodEntry = (Arc<dyn Handler>, MethodMetadata);
|
|
135
|
+
|
|
136
|
+
/// Type alias for the internal storage structure
|
|
137
|
+
type MethodStorage = Arc<RwLock<HashMap<String, MethodEntry>>>;
|
|
138
|
+
|
|
139
|
+
/// Type alias for list_all return type: (name, handler, metadata)
|
|
140
|
+
type MethodListEntry = (String, Arc<dyn Handler>, MethodMetadata);
|
|
141
|
+
|
|
142
|
+
/// Thread-safe registry for JSON-RPC methods
|
|
143
|
+
///
|
|
144
|
+
/// Stores handlers along with their metadata. The registry uses `Arc<RwLock>` for
|
|
145
|
+
/// thread-safe concurrent access with low contention for reads.
|
|
146
|
+
///
|
|
147
|
+
/// # Example
|
|
148
|
+
///
|
|
149
|
+
/// ```ignore
|
|
150
|
+
/// use spikard_http::jsonrpc::method_registry::{JsonRpcMethodRegistry, MethodMetadata};
|
|
151
|
+
/// use std::sync::Arc;
|
|
152
|
+
///
|
|
153
|
+
/// let registry = JsonRpcMethodRegistry::new();
|
|
154
|
+
///
|
|
155
|
+
/// // Register a method (handler implementation omitted for brevity)
|
|
156
|
+
/// registry.register(
|
|
157
|
+
/// "add",
|
|
158
|
+
/// Arc::new(add_handler),
|
|
159
|
+
/// MethodMetadata::new("add").with_description("Add two numbers"),
|
|
160
|
+
/// );
|
|
161
|
+
///
|
|
162
|
+
/// // Lookup a method
|
|
163
|
+
/// if let Some(handler) = registry.get("add") {
|
|
164
|
+
/// // Use handler
|
|
165
|
+
/// }
|
|
166
|
+
/// ```
|
|
167
|
+
pub struct JsonRpcMethodRegistry {
|
|
168
|
+
/// Internal storage: method name -> (handler, metadata)
|
|
169
|
+
methods: MethodStorage,
|
|
170
|
+
}
|
|
171
|
+
|
|
172
|
+
impl JsonRpcMethodRegistry {
|
|
173
|
+
/// Create a new empty method registry
|
|
174
|
+
pub fn new() -> Self {
|
|
175
|
+
Self {
|
|
176
|
+
methods: Arc::new(RwLock::new(HashMap::new())),
|
|
177
|
+
}
|
|
178
|
+
}
|
|
179
|
+
|
|
180
|
+
/// Register a method with its handler and metadata
|
|
181
|
+
///
|
|
182
|
+
/// If a method with the same name already exists, it will be replaced.
|
|
183
|
+
///
|
|
184
|
+
/// # Arguments
|
|
185
|
+
///
|
|
186
|
+
/// * `name` - The method name (e.g., "add", "multiply")
|
|
187
|
+
/// * `handler` - The handler that processes this method
|
|
188
|
+
/// * `metadata` - Metadata describing the method
|
|
189
|
+
///
|
|
190
|
+
/// # Returns
|
|
191
|
+
///
|
|
192
|
+
/// Returns `Ok(())` on success, or `Err(RegistryError)` if the lock cannot be acquired.
|
|
193
|
+
///
|
|
194
|
+
/// # Example
|
|
195
|
+
///
|
|
196
|
+
/// ```ignore
|
|
197
|
+
/// # use spikard_http::jsonrpc::{JsonRpcMethodRegistry, MethodMetadata};
|
|
198
|
+
/// # use std::sync::Arc;
|
|
199
|
+
/// # struct DummyHandler;
|
|
200
|
+
/// # impl spikard_http::handler_trait::Handler for DummyHandler {
|
|
201
|
+
/// # fn call(&self, _: axum::http::Request<axum::body::Body>, _: spikard_http::handler_trait::RequestData) -> std::pin::Pin<Box<dyn std::future::Future<Output = spikard_http::handler_trait::HandlerResult> + Send + '_>> {
|
|
202
|
+
/// # Box::pin(async { Err((axum::http::StatusCode::OK, String::new())) })
|
|
203
|
+
/// # }
|
|
204
|
+
/// # }
|
|
205
|
+
/// let registry = JsonRpcMethodRegistry::new();
|
|
206
|
+
/// let handler = Arc::new(DummyHandler);
|
|
207
|
+
/// let metadata = MethodMetadata::new("test");
|
|
208
|
+
/// registry.register("test", handler, metadata)?;
|
|
209
|
+
/// # Ok::<(), Box<dyn std::error::Error>>(())
|
|
210
|
+
/// ```
|
|
211
|
+
pub fn register(
|
|
212
|
+
&self,
|
|
213
|
+
name: impl Into<String>,
|
|
214
|
+
handler: Arc<dyn Handler>,
|
|
215
|
+
metadata: MethodMetadata,
|
|
216
|
+
) -> Result<(), RegistryError> {
|
|
217
|
+
let name = name.into();
|
|
218
|
+
let mut methods = self.methods.write().map_err(|_| RegistryError::lock_poisoned())?;
|
|
219
|
+
methods.insert(name, (handler, metadata));
|
|
220
|
+
Ok(())
|
|
221
|
+
}
|
|
222
|
+
|
|
223
|
+
/// Get a handler by method name
|
|
224
|
+
///
|
|
225
|
+
/// Returns `None` if the method is not registered.
|
|
226
|
+
///
|
|
227
|
+
/// # Arguments
|
|
228
|
+
///
|
|
229
|
+
/// * `name` - The method name to look up
|
|
230
|
+
///
|
|
231
|
+
/// # Returns
|
|
232
|
+
///
|
|
233
|
+
/// `Ok(Option<Arc<dyn Handler>>)` containing the handler if found, `Ok(None)` if not found,
|
|
234
|
+
/// or `Err(RegistryError)` if the lock cannot be acquired.
|
|
235
|
+
pub fn get(&self, name: &str) -> Result<Option<Arc<dyn Handler>>, RegistryError> {
|
|
236
|
+
let methods = self.methods.read().map_err(|_| RegistryError::lock_poisoned())?;
|
|
237
|
+
Ok(methods.get(name).map(|(handler, _)| Arc::clone(handler)))
|
|
238
|
+
}
|
|
239
|
+
|
|
240
|
+
/// Get metadata for a method by name
|
|
241
|
+
///
|
|
242
|
+
/// Returns `None` if the method is not registered.
|
|
243
|
+
///
|
|
244
|
+
/// # Arguments
|
|
245
|
+
///
|
|
246
|
+
/// * `name` - The method name to look up
|
|
247
|
+
///
|
|
248
|
+
/// # Returns
|
|
249
|
+
///
|
|
250
|
+
/// `Ok(Option<MethodMetadata>)` containing the metadata if found, `Ok(None)` if not found,
|
|
251
|
+
/// or `Err(RegistryError)` if the lock cannot be acquired.
|
|
252
|
+
pub fn get_metadata(&self, name: &str) -> Result<Option<MethodMetadata>, RegistryError> {
|
|
253
|
+
let methods = self.methods.read().map_err(|_| RegistryError::lock_poisoned())?;
|
|
254
|
+
Ok(methods.get(name).map(|(_, metadata)| metadata.clone()))
|
|
255
|
+
}
|
|
256
|
+
|
|
257
|
+
/// Get both handler and metadata for a method
|
|
258
|
+
///
|
|
259
|
+
/// Returns `None` if the method is not registered.
|
|
260
|
+
///
|
|
261
|
+
/// # Arguments
|
|
262
|
+
///
|
|
263
|
+
/// * `name` - The method name to look up
|
|
264
|
+
///
|
|
265
|
+
/// # Returns
|
|
266
|
+
///
|
|
267
|
+
/// `Ok(Option<MethodEntry>)` if found, `Ok(None)` if not found,
|
|
268
|
+
/// or `Err(RegistryError)` if the lock cannot be acquired.
|
|
269
|
+
pub fn get_with_metadata(&self, name: &str) -> Result<Option<MethodEntry>, RegistryError> {
|
|
270
|
+
let methods = self.methods.read().map_err(|_| RegistryError::lock_poisoned())?;
|
|
271
|
+
Ok(methods
|
|
272
|
+
.get(name)
|
|
273
|
+
.map(|(handler, metadata)| (Arc::clone(handler), metadata.clone())))
|
|
274
|
+
}
|
|
275
|
+
|
|
276
|
+
/// List all registered method names
|
|
277
|
+
///
|
|
278
|
+
/// # Returns
|
|
279
|
+
///
|
|
280
|
+
/// `Ok(Vec<String>)` containing all registered method names, sorted lexicographically,
|
|
281
|
+
/// or `Err(RegistryError)` if the lock cannot be acquired.
|
|
282
|
+
pub fn list_methods(&self) -> Result<Vec<String>, RegistryError> {
|
|
283
|
+
let methods = self.methods.read().map_err(|_| RegistryError::lock_poisoned())?;
|
|
284
|
+
let mut names: Vec<String> = methods.keys().cloned().collect();
|
|
285
|
+
names.sort();
|
|
286
|
+
Ok(names)
|
|
287
|
+
}
|
|
288
|
+
|
|
289
|
+
/// Check if a method is registered
|
|
290
|
+
///
|
|
291
|
+
/// # Arguments
|
|
292
|
+
///
|
|
293
|
+
/// * `name` - The method name to check
|
|
294
|
+
///
|
|
295
|
+
/// # Returns
|
|
296
|
+
///
|
|
297
|
+
/// `Ok(true)` if the method is registered, `Ok(false)` if not,
|
|
298
|
+
/// or `Err(RegistryError)` if the lock cannot be acquired.
|
|
299
|
+
pub fn contains(&self, name: &str) -> Result<bool, RegistryError> {
|
|
300
|
+
let methods = self.methods.read().map_err(|_| RegistryError::lock_poisoned())?;
|
|
301
|
+
Ok(methods.contains_key(name))
|
|
302
|
+
}
|
|
303
|
+
|
|
304
|
+
/// Get the number of registered methods
|
|
305
|
+
///
|
|
306
|
+
/// # Returns
|
|
307
|
+
///
|
|
308
|
+
/// `Ok(usize)` containing the count of registered methods,
|
|
309
|
+
/// or `Err(RegistryError)` if the lock cannot be acquired.
|
|
310
|
+
pub fn len(&self) -> Result<usize, RegistryError> {
|
|
311
|
+
let methods = self.methods.read().map_err(|_| RegistryError::lock_poisoned())?;
|
|
312
|
+
Ok(methods.len())
|
|
313
|
+
}
|
|
314
|
+
|
|
315
|
+
/// Check if the registry is empty
|
|
316
|
+
///
|
|
317
|
+
/// # Returns
|
|
318
|
+
///
|
|
319
|
+
/// `Ok(true)` if no methods are registered, `Ok(false)` if any methods exist,
|
|
320
|
+
/// or `Err(RegistryError)` if the lock cannot be acquired.
|
|
321
|
+
pub fn is_empty(&self) -> Result<bool, RegistryError> {
|
|
322
|
+
let methods = self.methods.read().map_err(|_| RegistryError::lock_poisoned())?;
|
|
323
|
+
Ok(methods.is_empty())
|
|
324
|
+
}
|
|
325
|
+
|
|
326
|
+
/// Remove a method from the registry
|
|
327
|
+
///
|
|
328
|
+
/// Returns `Ok(true)` if the method was removed, `Ok(false)` if it didn't exist.
|
|
329
|
+
///
|
|
330
|
+
/// # Arguments
|
|
331
|
+
///
|
|
332
|
+
/// * `name` - The method name to remove
|
|
333
|
+
///
|
|
334
|
+
/// # Returns
|
|
335
|
+
///
|
|
336
|
+
/// `Ok(true)` if the method was removed, `Ok(false)` if not found,
|
|
337
|
+
/// or `Err(RegistryError)` if the lock cannot be acquired.
|
|
338
|
+
pub fn remove(&self, name: &str) -> Result<bool, RegistryError> {
|
|
339
|
+
let mut methods = self.methods.write().map_err(|_| RegistryError::lock_poisoned())?;
|
|
340
|
+
Ok(methods.remove(name).is_some())
|
|
341
|
+
}
|
|
342
|
+
|
|
343
|
+
/// Clear all methods from the registry
|
|
344
|
+
///
|
|
345
|
+
/// # Returns
|
|
346
|
+
///
|
|
347
|
+
/// `Ok(())` on success, or `Err(RegistryError)` if the lock cannot be acquired.
|
|
348
|
+
pub fn clear(&self) -> Result<(), RegistryError> {
|
|
349
|
+
let mut methods = self.methods.write().map_err(|_| RegistryError::lock_poisoned())?;
|
|
350
|
+
methods.clear();
|
|
351
|
+
Ok(())
|
|
352
|
+
}
|
|
353
|
+
|
|
354
|
+
/// Get all methods with their metadata
|
|
355
|
+
///
|
|
356
|
+
/// # Returns
|
|
357
|
+
///
|
|
358
|
+
/// `Ok(Vec)` containing tuples of method name, handler, and metadata,
|
|
359
|
+
/// or `Err(RegistryError)` if the lock cannot be acquired.
|
|
360
|
+
pub fn list_all(&self) -> Result<Vec<MethodListEntry>, RegistryError> {
|
|
361
|
+
let methods = self.methods.read().map_err(|_| RegistryError::lock_poisoned())?;
|
|
362
|
+
Ok(methods
|
|
363
|
+
.iter()
|
|
364
|
+
.map(|(name, (handler, metadata))| (name.clone(), Arc::clone(handler), metadata.clone()))
|
|
365
|
+
.collect())
|
|
366
|
+
}
|
|
367
|
+
}
|
|
368
|
+
|
|
369
|
+
impl Default for JsonRpcMethodRegistry {
|
|
370
|
+
fn default() -> Self {
|
|
371
|
+
Self::new()
|
|
372
|
+
}
|
|
373
|
+
}
|
|
374
|
+
|
|
375
|
+
impl Clone for JsonRpcMethodRegistry {
|
|
376
|
+
fn clone(&self) -> Self {
|
|
377
|
+
Self {
|
|
378
|
+
methods: Arc::clone(&self.methods),
|
|
379
|
+
}
|
|
380
|
+
}
|
|
381
|
+
}
|
|
382
|
+
|
|
383
|
+
#[cfg(test)]
|
|
384
|
+
mod tests {
|
|
385
|
+
use super::*;
|
|
386
|
+
use crate::handler_trait::{HandlerResult, RequestData};
|
|
387
|
+
use axum::body::Body;
|
|
388
|
+
use axum::http::Request;
|
|
389
|
+
use std::panic;
|
|
390
|
+
|
|
391
|
+
/// Mock handler for testing
|
|
392
|
+
struct MockHandler;
|
|
393
|
+
|
|
394
|
+
impl Handler for MockHandler {
|
|
395
|
+
fn call(
|
|
396
|
+
&self,
|
|
397
|
+
_request: Request<Body>,
|
|
398
|
+
_request_data: RequestData,
|
|
399
|
+
) -> std::pin::Pin<Box<dyn std::future::Future<Output = HandlerResult> + Send + '_>> {
|
|
400
|
+
Box::pin(async { Err((axum::http::StatusCode::OK, "mock".to_string())) })
|
|
401
|
+
}
|
|
402
|
+
}
|
|
403
|
+
|
|
404
|
+
fn create_test_registry() -> JsonRpcMethodRegistry {
|
|
405
|
+
JsonRpcMethodRegistry::new()
|
|
406
|
+
}
|
|
407
|
+
|
|
408
|
+
fn create_mock_handler() -> Arc<dyn Handler> {
|
|
409
|
+
Arc::new(MockHandler)
|
|
410
|
+
}
|
|
411
|
+
|
|
412
|
+
#[test]
|
|
413
|
+
fn test_new_registry_is_empty() {
|
|
414
|
+
let registry = create_test_registry();
|
|
415
|
+
assert!(registry.is_empty().unwrap());
|
|
416
|
+
assert_eq!(registry.len().unwrap(), 0);
|
|
417
|
+
assert!(registry.list_methods().unwrap().is_empty());
|
|
418
|
+
}
|
|
419
|
+
|
|
420
|
+
#[test]
|
|
421
|
+
fn test_register_and_get_method() {
|
|
422
|
+
let registry = create_test_registry();
|
|
423
|
+
let handler = create_mock_handler();
|
|
424
|
+
let metadata = MethodMetadata::new("test_method");
|
|
425
|
+
|
|
426
|
+
registry
|
|
427
|
+
.register("test_method", handler.clone(), metadata.clone())
|
|
428
|
+
.unwrap();
|
|
429
|
+
|
|
430
|
+
assert!(!registry.is_empty().unwrap());
|
|
431
|
+
assert_eq!(registry.len().unwrap(), 1);
|
|
432
|
+
assert!(registry.contains("test_method").unwrap());
|
|
433
|
+
assert!(registry.get("test_method").unwrap().is_some());
|
|
434
|
+
assert_eq!(
|
|
435
|
+
registry.get_metadata("test_method").unwrap().unwrap().name,
|
|
436
|
+
"test_method"
|
|
437
|
+
);
|
|
438
|
+
}
|
|
439
|
+
|
|
440
|
+
#[test]
|
|
441
|
+
fn test_get_nonexistent_method() {
|
|
442
|
+
let registry = create_test_registry();
|
|
443
|
+
assert!(registry.get("nonexistent").unwrap().is_none());
|
|
444
|
+
assert!(registry.get_metadata("nonexistent").unwrap().is_none());
|
|
445
|
+
}
|
|
446
|
+
|
|
447
|
+
#[test]
|
|
448
|
+
fn test_list_methods_returns_sorted() {
|
|
449
|
+
let registry = create_test_registry();
|
|
450
|
+
let handler = create_mock_handler();
|
|
451
|
+
|
|
452
|
+
registry
|
|
453
|
+
.register("zebra", handler.clone(), MethodMetadata::new("zebra"))
|
|
454
|
+
.unwrap();
|
|
455
|
+
registry
|
|
456
|
+
.register("apple", handler.clone(), MethodMetadata::new("apple"))
|
|
457
|
+
.unwrap();
|
|
458
|
+
registry
|
|
459
|
+
.register("banana", handler.clone(), MethodMetadata::new("banana"))
|
|
460
|
+
.unwrap();
|
|
461
|
+
|
|
462
|
+
let methods = registry.list_methods().unwrap();
|
|
463
|
+
assert_eq!(methods, vec!["apple", "banana", "zebra"]);
|
|
464
|
+
}
|
|
465
|
+
|
|
466
|
+
#[test]
|
|
467
|
+
fn test_register_overwrites_existing() {
|
|
468
|
+
let registry = create_test_registry();
|
|
469
|
+
let handler1 = create_mock_handler();
|
|
470
|
+
let handler2 = create_mock_handler();
|
|
471
|
+
|
|
472
|
+
registry
|
|
473
|
+
.register("method", handler1, MethodMetadata::new("method"))
|
|
474
|
+
.unwrap();
|
|
475
|
+
assert_eq!(registry.len().unwrap(), 1);
|
|
476
|
+
|
|
477
|
+
registry
|
|
478
|
+
.register("method", handler2, MethodMetadata::new("method"))
|
|
479
|
+
.unwrap();
|
|
480
|
+
assert_eq!(registry.len().unwrap(), 1);
|
|
481
|
+
}
|
|
482
|
+
|
|
483
|
+
#[test]
|
|
484
|
+
fn test_remove_method() {
|
|
485
|
+
let registry = create_test_registry();
|
|
486
|
+
let handler = create_mock_handler();
|
|
487
|
+
|
|
488
|
+
registry
|
|
489
|
+
.register("method", handler, MethodMetadata::new("method"))
|
|
490
|
+
.unwrap();
|
|
491
|
+
assert_eq!(registry.len().unwrap(), 1);
|
|
492
|
+
|
|
493
|
+
let removed = registry.remove("method").unwrap();
|
|
494
|
+
assert!(removed);
|
|
495
|
+
assert_eq!(registry.len().unwrap(), 0);
|
|
496
|
+
assert!(registry.get("method").unwrap().is_none());
|
|
497
|
+
}
|
|
498
|
+
|
|
499
|
+
#[test]
|
|
500
|
+
fn test_remove_nonexistent_method() {
|
|
501
|
+
let registry = create_test_registry();
|
|
502
|
+
let removed = registry.remove("nonexistent").unwrap();
|
|
503
|
+
assert!(!removed);
|
|
504
|
+
}
|
|
505
|
+
|
|
506
|
+
#[test]
|
|
507
|
+
fn test_clear_registry() {
|
|
508
|
+
let registry = create_test_registry();
|
|
509
|
+
let handler = create_mock_handler();
|
|
510
|
+
|
|
511
|
+
registry
|
|
512
|
+
.register("method1", handler.clone(), MethodMetadata::new("method1"))
|
|
513
|
+
.unwrap();
|
|
514
|
+
registry
|
|
515
|
+
.register("method2", handler.clone(), MethodMetadata::new("method2"))
|
|
516
|
+
.unwrap();
|
|
517
|
+
registry
|
|
518
|
+
.register("method3", handler.clone(), MethodMetadata::new("method3"))
|
|
519
|
+
.unwrap();
|
|
520
|
+
|
|
521
|
+
assert_eq!(registry.len().unwrap(), 3);
|
|
522
|
+
registry.clear().unwrap();
|
|
523
|
+
assert_eq!(registry.len().unwrap(), 0);
|
|
524
|
+
assert!(registry.is_empty().unwrap());
|
|
525
|
+
}
|
|
526
|
+
|
|
527
|
+
#[test]
|
|
528
|
+
fn test_get_with_metadata() {
|
|
529
|
+
let registry = create_test_registry();
|
|
530
|
+
let handler = create_mock_handler();
|
|
531
|
+
let metadata = MethodMetadata::new("method").with_description("Test method");
|
|
532
|
+
|
|
533
|
+
registry.register("method", handler.clone(), metadata).unwrap();
|
|
534
|
+
|
|
535
|
+
let result = registry.get_with_metadata("method").unwrap();
|
|
536
|
+
assert!(result.is_some());
|
|
537
|
+
|
|
538
|
+
let (_retrieved_handler, retrieved_metadata) = result.unwrap();
|
|
539
|
+
assert_eq!(retrieved_metadata.name, "method");
|
|
540
|
+
assert_eq!(retrieved_metadata.description, Some("Test method".to_string()));
|
|
541
|
+
}
|
|
542
|
+
|
|
543
|
+
#[test]
|
|
544
|
+
fn test_list_all() {
|
|
545
|
+
let registry = create_test_registry();
|
|
546
|
+
let handler = create_mock_handler();
|
|
547
|
+
|
|
548
|
+
registry
|
|
549
|
+
.register("add", handler.clone(), MethodMetadata::new("add"))
|
|
550
|
+
.unwrap();
|
|
551
|
+
registry
|
|
552
|
+
.register("subtract", handler.clone(), MethodMetadata::new("subtract"))
|
|
553
|
+
.unwrap();
|
|
554
|
+
|
|
555
|
+
let all = registry.list_all().unwrap();
|
|
556
|
+
assert_eq!(all.len(), 2);
|
|
557
|
+
|
|
558
|
+
let names: Vec<String> = all.iter().map(|(name, _, _)| name.clone()).collect();
|
|
559
|
+
assert!(names.contains(&"add".to_string()));
|
|
560
|
+
assert!(names.contains(&"subtract".to_string()));
|
|
561
|
+
}
|
|
562
|
+
|
|
563
|
+
#[test]
|
|
564
|
+
fn test_clone_shares_registry() {
|
|
565
|
+
let registry1 = create_test_registry();
|
|
566
|
+
let handler = create_mock_handler();
|
|
567
|
+
|
|
568
|
+
registry1
|
|
569
|
+
.register("method", handler, MethodMetadata::new("method"))
|
|
570
|
+
.unwrap();
|
|
571
|
+
|
|
572
|
+
let registry2 = registry1.clone();
|
|
573
|
+
assert_eq!(registry2.len().unwrap(), 1);
|
|
574
|
+
assert!(registry2.contains("method").unwrap());
|
|
575
|
+
}
|
|
576
|
+
|
|
577
|
+
#[test]
|
|
578
|
+
fn test_metadata_builder_pattern() {
|
|
579
|
+
let metadata = MethodMetadata::new("test")
|
|
580
|
+
.with_description("Test description")
|
|
581
|
+
.with_tag("math")
|
|
582
|
+
.with_tag("utility")
|
|
583
|
+
.mark_deprecated();
|
|
584
|
+
|
|
585
|
+
assert_eq!(metadata.name, "test");
|
|
586
|
+
assert_eq!(metadata.description, Some("Test description".to_string()));
|
|
587
|
+
assert_eq!(metadata.tags, vec!["math", "utility"]);
|
|
588
|
+
assert!(metadata.deprecated);
|
|
589
|
+
}
|
|
590
|
+
|
|
591
|
+
#[test]
|
|
592
|
+
fn test_metadata_with_schemas() {
|
|
593
|
+
let params_schema = serde_json::json!({
|
|
594
|
+
"type": "object",
|
|
595
|
+
"properties": {
|
|
596
|
+
"x": { "type": "number" },
|
|
597
|
+
"y": { "type": "number" }
|
|
598
|
+
}
|
|
599
|
+
});
|
|
600
|
+
|
|
601
|
+
let result_schema = serde_json::json!({
|
|
602
|
+
"type": "number"
|
|
603
|
+
});
|
|
604
|
+
|
|
605
|
+
let metadata = MethodMetadata::new("add")
|
|
606
|
+
.with_params_schema(params_schema.clone())
|
|
607
|
+
.with_result_schema(result_schema.clone());
|
|
608
|
+
|
|
609
|
+
assert_eq!(metadata.params_schema, Some(params_schema));
|
|
610
|
+
assert_eq!(metadata.result_schema, Some(result_schema));
|
|
611
|
+
}
|
|
612
|
+
|
|
613
|
+
#[test]
|
|
614
|
+
fn test_metadata_with_examples() {
|
|
615
|
+
let example = MethodExample {
|
|
616
|
+
name: "example1".to_string(),
|
|
617
|
+
description: Some("Test example".to_string()),
|
|
618
|
+
params: serde_json::json!({"x": 1, "y": 2}),
|
|
619
|
+
result: serde_json::json!(3),
|
|
620
|
+
};
|
|
621
|
+
|
|
622
|
+
let metadata = MethodMetadata::new("add").with_example(example.clone());
|
|
623
|
+
|
|
624
|
+
assert_eq!(metadata.examples.len(), 1);
|
|
625
|
+
assert_eq!(metadata.examples[0].name, "example1");
|
|
626
|
+
assert_eq!(metadata.examples[0].description, Some("Test example".to_string()));
|
|
627
|
+
}
|
|
628
|
+
|
|
629
|
+
#[test]
|
|
630
|
+
fn test_registry_errors_on_poisoned_lock() {
|
|
631
|
+
let registry = create_test_registry();
|
|
632
|
+
let _ = panic::catch_unwind(|| {
|
|
633
|
+
let _guard = registry.methods.write().expect("lock write");
|
|
634
|
+
panic!("poison the lock");
|
|
635
|
+
});
|
|
636
|
+
|
|
637
|
+
let handler = create_mock_handler();
|
|
638
|
+
let err = registry
|
|
639
|
+
.register("method", handler, MethodMetadata::new("method"))
|
|
640
|
+
.expect_err("poisoned lock should error");
|
|
641
|
+
assert!(err.to_string().contains("lock was poisoned"));
|
|
642
|
+
|
|
643
|
+
match registry.get("method") {
|
|
644
|
+
Err(err) => assert!(err.to_string().contains("lock was poisoned")),
|
|
645
|
+
Ok(_) => panic!("expected poisoned lock error"),
|
|
646
|
+
}
|
|
647
|
+
}
|
|
648
|
+
}
|
|
@@ -0,0 +1,58 @@
|
|
|
1
|
+
//! JSON-RPC protocol support for Spikard HTTP
|
|
2
|
+
//!
|
|
3
|
+
//! This module provides JSON-RPC 2.0 protocol support including method registration,
|
|
4
|
+
//! handler lookup, and metadata management.
|
|
5
|
+
|
|
6
|
+
pub mod http_handler;
|
|
7
|
+
pub mod method_registry;
|
|
8
|
+
pub mod protocol;
|
|
9
|
+
pub mod router;
|
|
10
|
+
|
|
11
|
+
use serde::{Deserialize, Serialize};
|
|
12
|
+
|
|
13
|
+
pub use http_handler::{JsonRpcState, handle_jsonrpc};
|
|
14
|
+
pub use method_registry::{JsonRpcMethodRegistry, MethodExample, MethodMetadata};
|
|
15
|
+
pub use protocol::{
|
|
16
|
+
JsonRpcErrorResponse, JsonRpcRequest, JsonRpcResponse, JsonRpcResponseType, error_codes, validate_method_name,
|
|
17
|
+
};
|
|
18
|
+
pub use router::{JsonRpcRequestOrBatch, JsonRpcRouter};
|
|
19
|
+
|
|
20
|
+
/// JSON-RPC server configuration
|
|
21
|
+
#[derive(Debug, Clone, Serialize, Deserialize)]
|
|
22
|
+
pub struct JsonRpcConfig {
|
|
23
|
+
/// Enable JSON-RPC endpoint
|
|
24
|
+
#[serde(default)]
|
|
25
|
+
pub enabled: bool,
|
|
26
|
+
/// HTTP endpoint path for JSON-RPC requests (default: "/rpc")
|
|
27
|
+
#[serde(default = "default_endpoint_path")]
|
|
28
|
+
pub endpoint_path: String,
|
|
29
|
+
/// Enable batch request processing (default: true)
|
|
30
|
+
#[serde(default = "default_true")]
|
|
31
|
+
pub enable_batch: bool,
|
|
32
|
+
/// Maximum number of requests in a batch (default: 100)
|
|
33
|
+
#[serde(default = "default_max_batch_size")]
|
|
34
|
+
pub max_batch_size: usize,
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
fn default_endpoint_path() -> String {
|
|
38
|
+
"/rpc".to_string()
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
fn default_true() -> bool {
|
|
42
|
+
true
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
fn default_max_batch_size() -> usize {
|
|
46
|
+
100
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
impl Default for JsonRpcConfig {
|
|
50
|
+
fn default() -> Self {
|
|
51
|
+
Self {
|
|
52
|
+
enabled: true,
|
|
53
|
+
endpoint_path: default_endpoint_path(),
|
|
54
|
+
enable_batch: default_true(),
|
|
55
|
+
max_batch_size: default_max_batch_size(),
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
}
|