This commit is contained in:
Guillermo Céspedes Tabárez 2025-03-21 16:21:29 -03:00 committed by GitHub
commit 8f7080fd8d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 741 additions and 3 deletions

View File

@ -2,6 +2,8 @@
## Unreleased
- Add `resources-introspection` feature for retrieving configured route paths and HTTP methods.
## 4.10.2
- No significant changes since `4.10.1`.

View File

@ -128,6 +128,9 @@ compat = [
# Opt-out forwards-compatibility for handler visibility inheritance fix.
compat-routing-macros-force-pub = ["actix-web-codegen?/compat-routing-macros-force-pub"]
# Enabling the retrieval of metadata for initialized resources, including path and HTTP method.
resources-introspection = []
[dependencies]
actix-codec = "0.5"
actix-macros = { version = "0.2.3", optional = true }

View File

@ -82,6 +82,9 @@ where
let (config, services) = config.into_services();
#[cfg(feature = "resources-introspection")]
let mut rdef_methods: Vec<(String, Vec<String>)> = Vec::new();
// complete pipeline creation.
*self.factory_ref.borrow_mut() = Some(AppRoutingFactory {
default,
@ -89,6 +92,24 @@ where
.into_iter()
.map(|(mut rdef, srv, guards, nested)| {
rmap.add(&mut rdef, nested);
#[cfg(feature = "resources-introspection")]
{
let http_methods: Vec<String> =
guards.as_ref().map_or_else(Vec::new, |g| {
g.iter()
.flat_map(|g| {
crate::guard::HttpMethodsExtractor::extract_http_methods(
&**g,
)
})
.collect::<Vec<_>>()
});
rdef_methods
.push((rdef.pattern().unwrap_or_default().to_string(), http_methods));
}
(rdef, srv, RefCell::new(guards))
})
.collect::<Vec<_>>()
@ -105,6 +126,11 @@ where
let rmap = Rc::new(rmap);
ResourceMap::finish(&rmap);
#[cfg(feature = "resources-introspection")]
{
crate::introspection::process_introspection(Rc::clone(&rmap), rdef_methods);
}
// construct all async data factory futures
let factory_futs = join_all(self.async_data_factories.iter().map(|f| f()));

View File

@ -11,7 +11,7 @@
//! or handler. This interface is defined by the [`Guard`] trait.
//!
//! Commonly-used guards are provided in this module as well as a way of creating a guard from a
//! closure ([`fn_guard`]). The [`Not`], [`Any`], and [`All`] guards are noteworthy, as they can be
//! closure ([`fn_guard`]). The [`Not`], [`Any()`], and [`All()`] guards are noteworthy, as they can be
//! used to compose other guards in a more flexible and semantic way than calling `.guard(...)` on
//! services multiple times (which might have different combining behavior than you want).
//!
@ -66,6 +66,17 @@ pub use self::{
host::{Host, HostGuard},
};
/// Enum to encapsulate various introspection details of a Guard.
#[derive(Debug, Clone)]
pub enum GuardDetail {
/// Detail associated with HTTP methods.
HttpMethods(Vec<String>),
/// Detail associated with headers (header, value).
Headers(Vec<(String, String)>),
/// Generic detail.
Generic(String),
}
/// Provides access to request parts that are useful during routing.
#[derive(Debug)]
pub struct GuardContext<'a> {
@ -124,12 +135,28 @@ impl<'a> GuardContext<'a> {
pub trait Guard {
/// Returns true if predicate condition is met for a given request.
fn check(&self, ctx: &GuardContext<'_>) -> bool;
/// Returns a nominal representation of the guard.
fn name(&self) -> String {
std::any::type_name::<Self>().to_string()
}
/// Returns detailed introspection information.
fn details(&self) -> Option<Vec<GuardDetail>> {
None
}
}
impl Guard for Rc<dyn Guard> {
fn check(&self, ctx: &GuardContext<'_>) -> bool {
(**self).check(ctx)
}
fn name(&self) -> String {
(**self).name()
}
fn details(&self) -> Option<Vec<GuardDetail>> {
(**self).details()
}
}
/// Creates a guard using the given function.
@ -195,7 +222,7 @@ pub fn Any<F: Guard + 'static>(guard: F) -> AnyGuard {
///
/// That is, only one contained guard needs to match in order for the aggregate guard to match.
///
/// Construct an `AnyGuard` using [`Any`].
/// Construct an `AnyGuard` using [`Any()`].
pub struct AnyGuard {
guards: Vec<Box<dyn Guard>>,
}
@ -219,6 +246,24 @@ impl Guard for AnyGuard {
false
}
fn name(&self) -> String {
format!(
"AnyGuard({})",
self.guards
.iter()
.map(|g| g.name())
.collect::<Vec<_>>()
.join(", ")
)
}
fn details(&self) -> Option<Vec<GuardDetail>> {
Some(
self.guards
.iter()
.flat_map(|g| g.details().unwrap_or_default())
.collect(),
)
}
}
/// Creates a guard that matches if all added guards match.
@ -247,7 +292,7 @@ pub fn All<F: Guard + 'static>(guard: F) -> AllGuard {
///
/// That is, **all** contained guard needs to match in order for the aggregate guard to match.
///
/// Construct an `AllGuard` using [`All`].
/// Construct an `AllGuard` using [`All()`].
pub struct AllGuard {
guards: Vec<Box<dyn Guard>>,
}
@ -271,6 +316,24 @@ impl Guard for AllGuard {
true
}
fn name(&self) -> String {
format!(
"AllGuard({})",
self.guards
.iter()
.map(|g| g.name())
.collect::<Vec<_>>()
.join(", ")
)
}
fn details(&self) -> Option<Vec<GuardDetail>> {
Some(
self.guards
.iter()
.flat_map(|g| g.details().unwrap_or_default())
.collect(),
)
}
}
/// Wraps a guard and inverts the outcome of its `Guard` implementation.
@ -291,6 +354,12 @@ impl<G: Guard> Guard for Not<G> {
fn check(&self, ctx: &GuardContext<'_>) -> bool {
!self.0.check(ctx)
}
fn name(&self) -> String {
format!("Not({})", self.0.name())
}
fn details(&self) -> Option<Vec<GuardDetail>> {
self.0.details()
}
}
/// Creates a guard that matches a specified HTTP method.
@ -320,6 +389,41 @@ impl Guard for MethodGuard {
ctx.head().method == self.0
}
fn name(&self) -> String {
self.0.to_string()
}
fn details(&self) -> Option<Vec<GuardDetail>> {
Some(vec![GuardDetail::HttpMethods(vec![self.0.to_string()])])
}
}
#[cfg(feature = "resources-introspection")]
pub trait HttpMethodsExtractor {
fn extract_http_methods(&self) -> Vec<String>;
}
#[cfg(feature = "resources-introspection")]
impl HttpMethodsExtractor for dyn Guard {
fn extract_http_methods(&self) -> Vec<String> {
let methods: Vec<String> = self
.details()
.unwrap_or_default()
.iter()
.flat_map(|detail| {
if let GuardDetail::HttpMethods(methods) = detail {
methods.clone()
} else {
vec!["UNKNOWN".to_string()]
}
})
.collect();
if methods.is_empty() {
vec!["UNKNOWN".to_string()]
} else {
methods
}
}
}
macro_rules! method_guard {
@ -382,6 +486,15 @@ impl Guard for HeaderGuard {
false
}
fn name(&self) -> String {
format!("Header({}, {})", self.0, self.1.to_str().unwrap_or(""))
}
fn details(&self) -> Option<Vec<GuardDetail>> {
Some(vec![GuardDetail::Headers(vec![(
self.0.to_string(),
self.1.to_str().unwrap_or("").to_string(),
)])])
}
}
#[cfg(test)]

View File

@ -0,0 +1,494 @@
use std::{
rc::Rc,
sync::{OnceLock, RwLock},
thread,
};
use crate::rmap::ResourceMap;
/// Represents an HTTP resource registered for introspection.
#[derive(Clone, Debug, PartialEq, Eq)]
pub struct ResourceIntrospection {
/// HTTP method (e.g., "GET").
pub method: String,
/// Route path (e.g., "/api/v1/test").
pub path: String,
}
/// A global registry of listed resources for introspection.
/// Only the designated thread can modify it.
static RESOURCE_REGISTRY: RwLock<Vec<ResourceIntrospection>> = RwLock::new(Vec::new());
/// Stores the thread ID of the designated thread (the first to call `process_introspection`).
/// Any other thread will immediately return without updating the global registry.
static DESIGNATED_THREAD: OnceLock<thread::ThreadId> = OnceLock::new();
/// Inserts a resource into the global registry, avoiding duplicates.
pub fn register_resource(resource: ResourceIntrospection) {
let mut global = RESOURCE_REGISTRY.write().unwrap();
if !global.iter().any(|r| r == &resource) {
global.push(resource);
}
}
/// Completes (updates) partial routes in the global registry whose path contains `marker`,
/// by applying the specified `prefix`.
pub fn complete_partial_routes_with_marker(marker: &str, prefix: &str) {
let mut global = RESOURCE_REGISTRY.write().unwrap();
let mut updated = Vec::new();
let mut remaining = Vec::new();
// Move all items out of the current registry.
for resource in global.drain(..) {
if resource.path.contains(marker) {
// Build the full path by applying the prefix if needed.
let full_path = if prefix.is_empty() {
resource.path.clone()
} else if prefix.ends_with('/') || resource.path.starts_with('/') {
format!("{}{}", prefix, resource.path)
} else {
format!("{}/{}", prefix, resource.path)
};
let completed = ResourceIntrospection {
method: resource.method,
path: full_path,
};
// Add to `updated` if it's not already in there.
if !updated.iter().any(|r| r == &completed) {
updated.push(completed);
}
} else {
// Keep this resource as-is.
remaining.push(resource);
}
}
// Merge updated items back with the remaining ones.
remaining.extend(updated);
*global = remaining;
}
/// Returns a **copy** of the global registry (safe to call from any thread).
pub fn get_registered_resources() -> Vec<ResourceIntrospection> {
RESOURCE_REGISTRY.read().unwrap().clone()
}
/// Processes introspection data for routes and methods.
/// Only the **first thread** that calls this function (the "designated" one) may update
/// the global resource registry. Any other thread will immediately return without updating it.
///
/// # Parameters
/// - `rmap`: A resource map convertible to a vector of route strings.
/// - `rdef_methods`: A vector of `(sub_path, [methods])`.
/// - A tuple with an **empty** methods vector is treated as a "marker" (a partial route)
/// for which we try to deduce a prefix by finding `sub_path` in a route, then calling
/// `complete_partial_routes_with_marker`.
/// - A tuple with one or more methods registers a resource with `register_resource`.
pub fn process_introspection(rmap: Rc<ResourceMap>, rdef_methods: Vec<(String, Vec<String>)>) {
// Determine the designated thread: if none is set yet, assign the current thread's ID.
// This ensures that the first thread to call this function becomes the designated thread.
let current_id = thread::current().id();
DESIGNATED_THREAD.get_or_init(|| current_id);
// If the current thread is not the designated one, return immediately.
// This ensures that only the designated thread updates the global registry,
// avoiding any interleaving or inconsistent updates from other threads.
if *DESIGNATED_THREAD.get().unwrap() != current_id {
return;
}
let rmap_vec = rmap.to_vec();
// If there is no data, nothing to process.
// Avoid unnecessary work.
if rmap_vec.is_empty() && rdef_methods.is_empty() {
return;
}
// Keep track of the deduced prefix for partial routes.
let mut deduced_prefix: Option<String> = None;
// 1. Handle "marker" entries (where methods is empty).
for (sub_path, http_methods) in &rdef_methods {
if http_methods.is_empty() {
// Find any route that contains sub_path and use it to deduce a prefix.
if let Some(route) = rmap_vec.iter().find(|r| r.contains(sub_path)) {
if let Some(pos) = route.find(sub_path) {
let prefix = &route[..pos];
deduced_prefix = Some(prefix.to_string());
// Complete partial routes in the global registry using this prefix.
complete_partial_routes_with_marker(sub_path, prefix);
}
}
}
}
// 2. Handle endpoint entries (where methods is non-empty).
for (sub_path, http_methods) in &rdef_methods {
if !http_methods.is_empty() {
// Identify candidate routes that end with sub_path (or exactly match "/" if sub_path == "/").
let candidates: Vec<&String> = if sub_path == "/" {
rmap_vec.iter().filter(|r| r.as_str() == "/").collect()
} else {
rmap_vec.iter().filter(|r| r.ends_with(sub_path)).collect()
};
// If we found any candidates, pick the best match.
if !candidates.is_empty() {
let chosen = if let Some(prefix) = &deduced_prefix {
if !prefix.is_empty() {
candidates
.iter()
.find(|&&r| r.starts_with(prefix))
.cloned()
.or_else(|| candidates.iter().min_by_key(|&&r| r.len()).cloned())
} else {
candidates.iter().min_by_key(|&&r| r.len()).cloned()
}
} else {
candidates.iter().min_by_key(|&&r| r.len()).cloned()
};
if let Some(full_route) = chosen {
// Register the endpoint in the global resource registry.
register_resource(ResourceIntrospection {
method: http_methods.join(","),
path: full_route.clone(),
});
}
}
}
}
}
#[cfg(test)]
mod tests {
use std::{num::NonZeroUsize, rc::Rc};
use actix_router::ResourceDef;
use tokio::sync::oneshot;
use super::*;
use crate::rmap::ResourceMap;
/// Helper function to create a ResourceMap from a list of route strings.
/// It creates a root ResourceMap with an empty prefix and adds each route as a leaf.
fn create_resource_map(routes: Vec<&str>) -> Rc<ResourceMap> {
// Create a root node with an empty prefix.
let mut root = ResourceMap::new(ResourceDef::root_prefix(""));
// For each route, create a ResourceDef and add it as a leaf (nested = None).
for route in routes {
let mut def = ResourceDef::new(route);
root.add(&mut def, None);
}
Rc::new(root)
}
// Helper function to run the full introspection flow.
// It processes introspection data for multiple blocks, each with a different set of routes and methods.
fn run_full_introspection_flow() {
// Block 1:
// rmap_vec: ["/item/{id}"]
// rdef_methods: []
process_introspection(create_resource_map(vec!["/item/{id}"]), vec![]);
// Block 2:
// rmap_vec: ["/info"]
// rdef_methods: []
process_introspection(create_resource_map(vec!["/info"]), vec![]);
// Block 3:
// rmap_vec: ["/guarded"]
// rdef_methods: []
process_introspection(create_resource_map(vec!["/guarded"]), vec![]);
// Block 4:
// rmap_vec: ["/v1/item/{id}", "/v1/info", "/v1/guarded"]
// rdef_methods: [("/item/{id}", ["GET"]), ("/info", ["POST"]), ("/guarded", ["UNKNOWN"])]
process_introspection(
create_resource_map(vec!["/v1/item/{id}", "/v1/info", "/v1/guarded"]),
vec![
("/item/{id}".to_string(), vec!["GET".to_string()]),
("/info".to_string(), vec!["POST".to_string()]),
("/guarded".to_string(), vec!["UNKNOWN".to_string()]),
],
);
// Block 5:
// rmap_vec: ["/hello"]
// rdef_methods: []
process_introspection(create_resource_map(vec!["/hello"]), vec![]);
// Block 6:
// rmap_vec: ["/v2/hello"]
// rdef_methods: [("/hello", ["GET"])]
process_introspection(
create_resource_map(vec!["/v2/hello"]),
vec![("/hello".to_string(), vec!["GET".to_string()])],
);
// Block 7:
// rmap_vec: ["/api/v1/item/{id}", "/api/v1/info", "/api/v1/guarded", "/api/v2/hello"]
// rdef_methods: [("/v1", []), ("/v2", [])]
process_introspection(
create_resource_map(vec![
"/api/v1/item/{id}",
"/api/v1/info",
"/api/v1/guarded",
"/api/v2/hello",
]),
vec![("/v1".to_string(), vec![]), ("/v2".to_string(), vec![])],
);
// Block 8:
// rmap_vec: ["/dashboard"]
// rdef_methods: []
process_introspection(create_resource_map(vec!["/dashboard"]), vec![]);
// Block 9:
// rmap_vec: ["/settings"]
// rdef_methods: [("/settings", ["GET"]), ("/settings", ["POST"])]
process_introspection(
create_resource_map(vec!["/settings"]),
vec![
("/settings".to_string(), vec!["GET".to_string()]),
("/settings".to_string(), vec!["POST".to_string()]),
],
);
// Block 10:
// rmap_vec: ["/admin/dashboard", "/admin/settings"]
// rdef_methods: [("/dashboard", ["GET"]), ("/settings", [])]
process_introspection(
create_resource_map(vec!["/admin/dashboard", "/admin/settings"]),
vec![
("/dashboard".to_string(), vec!["GET".to_string()]),
("/settings".to_string(), vec![]),
],
);
// Block 11:
// rmap_vec: ["/"]
// rdef_methods: [("/", ["GET"]), ("/", ["POST"])]
process_introspection(
create_resource_map(vec!["/"]),
vec![
("/".to_string(), vec!["GET".to_string()]),
("/".to_string(), vec!["POST".to_string()]),
],
);
// Block 12:
// rmap_vec: ["/ping"]
// rdef_methods: []
process_introspection(create_resource_map(vec!["/ping"]), vec![]);
// Block 13:
// rmap_vec: ["/multi"]
// rdef_methods: [("/multi", ["GET"]), ("/multi", ["POST"])]
process_introspection(
create_resource_map(vec!["/multi"]),
vec![
("/multi".to_string(), vec!["GET".to_string()]),
("/multi".to_string(), vec!["POST".to_string()]),
],
);
// Block 14:
// rmap_vec: ["/extra/ping", "/extra/multi"]
// rdef_methods: [("/ping", ["GET"]), ("/multi", [])]
process_introspection(
create_resource_map(vec!["/extra/ping", "/extra/multi"]),
vec![
("/ping".to_string(), vec!["GET".to_string()]),
("/multi".to_string(), vec![]),
],
);
// Block 15:
// rmap_vec: ["/other_guard"]
// rdef_methods: []
process_introspection(create_resource_map(vec!["/other_guard"]), vec![]);
// Block 16:
// rmap_vec: ["/all_guard"]
// rdef_methods: []
process_introspection(create_resource_map(vec!["/all_guard"]), vec![]);
// Block 17:
// rmap_vec: ["/api/v1/item/{id}", "/api/v1/info", "/api/v1/guarded", "/api/v2/hello",
// "/admin/dashboard", "/admin/settings", "/", "/extra/ping", "/extra/multi",
// "/other_guard", "/all_guard"]
// rdef_methods: [("/api", []), ("/admin", []), ("/", []), ("/extra", []),
// ("/other_guard", ["UNKNOWN"]), ("/all_guard", ["GET", "UNKNOWN", "POST"])]
process_introspection(
create_resource_map(vec![
"/api/v1/item/{id}",
"/api/v1/info",
"/api/v1/guarded",
"/api/v2/hello",
"/admin/dashboard",
"/admin/settings",
"/",
"/extra/ping",
"/extra/multi",
"/other_guard",
"/all_guard",
]),
vec![
("/api".to_string(), vec![]),
("/admin".to_string(), vec![]),
("/".to_string(), vec![]),
("/extra".to_string(), vec![]),
("/other_guard".to_string(), vec!["UNKNOWN".to_string()]),
(
"/all_guard".to_string(),
vec!["GET".to_string(), "UNKNOWN".to_string(), "POST".to_string()],
),
],
);
}
/// This test spawns multiple tasks that run the full introspection flow concurrently.
/// Only the designated task (the first one to call process_introspection) updates the global registry,
/// ensuring that the internal order remains consistent. Finally, we verify that get_registered_resources()
/// returns the expected set of listed resources.
/// Using a dedicated arbiter for each task ensures that the global registry is thread-safe.
#[actix_rt::test]
async fn test_introspection() {
// Number of tasks to spawn.
const NUM_TASKS: usize = 4;
let mut completion_receivers = Vec::with_capacity(NUM_TASKS);
// Check that the registry is initially empty.
let registered_resources = get_registered_resources();
assert_eq!(
registered_resources.len(),
0,
"Expected 0 registered resources, found: {:?}",
registered_resources
);
// Determine parallelism and max blocking threads.
let parallelism = std::thread::available_parallelism().map_or(2, NonZeroUsize::get);
let max_blocking_threads = std::cmp::max(512 / parallelism, 1);
// Spawn tasks on the arbiter. Each task runs the full introspection flow and then signals completion.
for _ in 0..NUM_TASKS {
let (tx, rx) = oneshot::channel();
#[cfg(all(target_os = "linux", feature = "experimental-io-uring"))]
let arbiter = {
// TODO: pass max blocking thread config when tokio-uring enable configuration
// on building runtime.
let _ = max_blocking_threads;
actix_rt::Arbiter::new()
};
#[cfg(not(all(target_os = "linux", feature = "experimental-io-uring")))]
let arbiter = actix_rt::Arbiter::with_tokio_rt(move || {
// Create an Arbiter with a dedicated Tokio runtime.
tokio::runtime::Builder::new_current_thread()
.enable_all()
.max_blocking_threads(max_blocking_threads)
.build()
.unwrap()
});
// Spawn the task on the arbiter.
arbiter.spawn(async move {
run_full_introspection_flow();
// Signal that this task has finished.
let _ = tx.send(());
});
completion_receivers.push(rx);
}
// Wait for all spawned tasks to complete.
for rx in completion_receivers {
let _ = rx.await;
}
// After all blocks, we expect the final registry to contain 14 entries.
let registered_resources = get_registered_resources();
assert_eq!(
registered_resources.len(),
14,
"Expected 14 registered resources, found: {:?}",
registered_resources
);
// List of expected resources
let expected_resources = vec![
ResourceIntrospection {
method: "GET".to_string(),
path: "/api/v1/item/{id}".to_string(),
},
ResourceIntrospection {
method: "POST".to_string(),
path: "/api/v1/info".to_string(),
},
ResourceIntrospection {
method: "UNKNOWN".to_string(),
path: "/api/v1/guarded".to_string(),
},
ResourceIntrospection {
method: "GET".to_string(),
path: "/api/v2/hello".to_string(),
},
ResourceIntrospection {
method: "GET".to_string(),
path: "/admin/settings".to_string(),
},
ResourceIntrospection {
method: "POST".to_string(),
path: "/admin/settings".to_string(),
},
ResourceIntrospection {
method: "GET".to_string(),
path: "/admin/dashboard".to_string(),
},
ResourceIntrospection {
method: "GET".to_string(),
path: "/extra/multi".to_string(),
},
ResourceIntrospection {
method: "POST".to_string(),
path: "/extra/multi".to_string(),
},
ResourceIntrospection {
method: "GET".to_string(),
path: "/extra/ping".to_string(),
},
ResourceIntrospection {
method: "GET".to_string(),
path: "/".to_string(),
},
ResourceIntrospection {
method: "POST".to_string(),
path: "/".to_string(),
},
ResourceIntrospection {
method: "UNKNOWN".to_string(),
path: "/other_guard".to_string(),
},
ResourceIntrospection {
method: "GET,UNKNOWN,POST".to_string(),
path: "/all_guard".to_string(),
},
];
for exp in expected_resources {
assert!(
registered_resources.contains(&exp),
"Expected resource not found: {:?}",
exp
);
}
}
}

View File

@ -108,6 +108,9 @@ mod thin_data;
pub(crate) mod types;
pub mod web;
#[cfg(feature = "resources-introspection")]
pub mod introspection;
#[doc(inline)]
pub use crate::error::Result;
pub use crate::{

View File

@ -433,6 +433,25 @@ where
rdef.set_name(name);
}
#[cfg(feature = "resources-introspection")]
let mut rdef_methods: Vec<(String, Vec<String>)> = Vec::new();
#[cfg(feature = "resources-introspection")]
let mut rmap = crate::rmap::ResourceMap::new(ResourceDef::prefix(""));
#[cfg(feature = "resources-introspection")]
{
rmap.add(&mut rdef, None);
self.routes.iter().for_each(|r| {
r.get_guards().iter().for_each(|g| {
let http_methods: Vec<String> =
crate::guard::HttpMethodsExtractor::extract_http_methods(&**g);
rdef_methods
.push((rdef.pattern().unwrap_or_default().to_string(), http_methods));
});
});
}
*self.factory_ref.borrow_mut() = Some(ResourceFactory {
routes: self.routes,
default: self.default,
@ -451,6 +470,14 @@ where
async { Ok(fut.await?.map_into_boxed_body()) }
});
#[cfg(feature = "resources-introspection")]
{
crate::introspection::process_introspection(
Rc::clone(&Rc::new(rmap.clone())),
rdef_methods,
);
}
config.register_service(rdef, guards, endpoint, None)
}
}

View File

@ -38,6 +38,42 @@ impl ResourceMap {
}
}
#[cfg(feature = "resources-introspection")]
/// Returns a list of all paths in the resource map.
pub fn to_vec(&self) -> Vec<String> {
let mut paths = Vec::new();
self.collect_full_paths(String::new(), &mut paths);
paths
}
#[cfg(feature = "resources-introspection")]
/// Recursive function that accumulates the full path and adds it only if the node is an endpoint (leaf).
fn collect_full_paths(&self, current_path: String, paths: &mut Vec<String>) {
// Get the current segment of the pattern
if let Some(segment) = self.pattern.pattern() {
let mut new_path = current_path;
// Add the '/' separator if necessary
if !segment.is_empty() {
if !new_path.ends_with('/') && !new_path.is_empty() && !segment.starts_with('/') {
new_path.push('/');
}
new_path.push_str(segment);
}
// If this node is an endpoint (has no children), add the full path
if self.nodes.is_none() {
paths.push(new_path.clone());
}
// If it has children, iterate over each one
if let Some(children) = &self.nodes {
for child in children {
child.collect_full_paths(new_path.clone(), paths);
}
}
}
}
/// Format resource map as tree structure (unfinished).
#[allow(dead_code)]
pub(crate) fn tree(&self) -> String {

View File

@ -65,6 +65,11 @@ impl Route {
pub(crate) fn take_guards(&mut self) -> Vec<Box<dyn Guard>> {
mem::take(Rc::get_mut(&mut self.guards).unwrap())
}
#[cfg(feature = "resources-introspection")]
pub(crate) fn get_guards(&self) -> &Vec<Box<dyn Guard>> {
&self.guards
}
}
impl ServiceFactory<ServiceRequest> for Route {

View File

@ -395,6 +395,9 @@ where
rmap.add(&mut rdef, None);
}
#[cfg(feature = "resources-introspection")]
let mut rdef_methods: Vec<(String, Vec<String>)> = Vec::new();
// complete scope pipeline creation
*self.factory_ref.borrow_mut() = Some(ScopeFactory {
default,
@ -404,6 +407,24 @@ where
.into_iter()
.map(|(mut rdef, srv, guards, nested)| {
rmap.add(&mut rdef, nested);
#[cfg(feature = "resources-introspection")]
{
let http_methods: Vec<String> =
guards.as_ref().map_or_else(Vec::new, |g| {
g.iter()
.flat_map(|g| {
crate::guard::HttpMethodsExtractor::extract_http_methods(
&**g,
)
})
.collect::<Vec<_>>()
});
rdef_methods
.push((rdef.pattern().unwrap_or_default().to_string(), http_methods));
}
(rdef, srv, RefCell::new(guards))
})
.collect::<Vec<_>>()
@ -431,6 +452,14 @@ where
async { Ok(fut.await?.map_into_boxed_body()) }
});
#[cfg(feature = "resources-introspection")]
{
crate::introspection::process_introspection(
Rc::clone(&Rc::new(rmap.clone())),
rdef_methods,
);
}
// register final service
config.register_service(
ResourceDef::root_prefix(&self.rdef),