Merge pull request #107 from Tuntii/quick-wins

Tuntii · web-flow · commit a943c4a4a7cd · 2026-02-08T22:26:51.000+03:00
chore(quick-wins): reduce dependency surface and align native OpenAPI…
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -29,11 +29,11 @@ rust-version = "1.78"
 
 [workspace.dependencies]
 # Async runtime
-tokio = { version = "1.35", features = ["full"] }
+tokio = "1.35"
 
 # HTTP
-hyper = { version = "1.1", features = ["full"] }
-hyper-util = { version = "0.1", features = ["full"] }
+hyper = "1.1"
+hyper-util = "0.1"
 http = "1.0"
 http-body-util = "0.1"
 
@@ -42,8 +42,6 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 
 # Middleware
-tower = { version = "0.4", features = ["full"] }
-tower-http = { version = "0.5", features = ["full"] }
 tower-service = "0.3"
 
 # Utilities
@@ -60,7 +58,6 @@ async-trait = "0.1"
 syn = { version = "2.0", features = ["full", "parsing", "extra-traits"] }
 quote = "1.0"
 proc-macro2 = "1.0"
-inventory = "0.3"
 linkme = "0.3"
 
 # Validation
@@ -72,9 +69,6 @@ uuid = { version = "1.6", features = ["v4"] }
 # Metrics
 prometheus = "0.13"
 
-# OpenAPI
-utoipa = { version = "4.2", features = ["uuid", "chrono"] }
-
 # TOON format
 toon-format = { version = "0.4", default-features = false }
 
diff --git a/crates/rustapi-core/Cargo.toml b/crates/rustapi-core/Cargo.toml
@@ -11,20 +11,17 @@ homepage.workspace = true
 
 [dependencies]
 # Async
-tokio = { workspace = true }
+tokio = { workspace = true, features = ["rt", "net", "time", "fs", "macros"] }
 futures-util = { workspace = true }
 pin-project-lite = { workspace = true }
 
 # HTTP
-hyper = { workspace = true }
-hyper-util = { workspace = true }
+hyper = { workspace = true, features = ["server", "http1"] }
+hyper-util = { workspace = true, features = ["tokio"] }
 http = { workspace = true }
 http-body-util = { workspace = true }
 bytes = { workspace = true }
 
-# Socket options
-socket2 = { version = "0.5", features = ["all"] }
-
 # Router
 matchit = { workspace = true }
 
@@ -38,15 +35,12 @@ simd-json = { version = "0.17", optional = true }
 smallvec = "1.13"
 
 # Middleware
-tower = { workspace = true }
 tower-service = { workspace = true }
-tower-http = { workspace = true }
 
 # Utilities
 thiserror = { workspace = true }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true }
-inventory = { workspace = true }
 linkme = { workspace = true }
 uuid = { workspace = true }
 base64 = "0.22"
@@ -59,7 +53,7 @@ brotli = { version = "6.0", optional = true }
 cookie = { version = "0.18", optional = true }
 
 # Validation
-validator = { workspace = true }
+validator = { workspace = true, optional = true }
 rustapi-validate = { workspace = true }
 
 # Metrics (optional)
@@ -79,7 +73,6 @@ h3-quinn = { version = "0.0.10", optional = true }
 rustls = { workspace = true, optional = true }
 rustls-pemfile = { workspace = true, optional = true }
 rcgen = { workspace = true, optional = true }
-chrono = "0.4.43"
 
 # Replay (feature-gated)
 async-trait = { workspace = true, optional = true }
@@ -95,6 +88,7 @@ async-trait = { workspace = true }
 default = ["swagger-ui", "tracing"]
 swagger-ui = ["rustapi-openapi/swagger-ui"]
 test-utils = []
+legacy-validator = ["dep:validator"]
 cookies = ["dep:cookie"]
 sqlx = ["dep:sqlx"]
 metrics = ["dep:prometheus"]
diff --git a/crates/rustapi-core/src/middleware/layer.rs b/crates/rustapi-core/src/middleware/layer.rs
@@ -9,7 +9,7 @@ use std::future::Future;
 use std::pin::Pin;
 use std::sync::Arc;
 use std::task::{Context, Poll};
-use tower::Service;
+use tower_service::Service;
 
 /// A boxed middleware function type
 #[allow(dead_code)]
diff --git a/crates/rustapi-core/src/status.rs b/crates/rustapi-core/src/status.rs
@@ -4,7 +4,7 @@ use std::collections::HashMap;
 use std::future::Future;
 use std::pin::Pin;
 use std::sync::{Arc, RwLock};
-use std::time::{Duration, Instant};
+use std::time::{Duration, Instant, SystemTime, UNIX_EPOCH};
 
 /// Configuration for the Status Page
 #[derive(Clone, Debug)]
@@ -97,8 +97,7 @@ impl StatusMonitor {
         }
         entry.total_latency_ms += duration.as_millis();
 
-        let now = chrono::Utc::now().to_rfc3339();
-        entry.last_access = Some(now);
+        entry.last_access = Some(format_unix_timestamp());
     }
 
     pub fn get_uptime(&self) -> Duration {
@@ -274,3 +273,10 @@ fn format_duration(d: Duration) -> String {
         format!("{}m {}s", minutes, secs)
     }
 }
+
+fn format_unix_timestamp() -> String {
+    let now = SystemTime::now()
+        .duration_since(UNIX_EPOCH)
+        .unwrap_or_else(|_| Duration::from_secs(0));
+    format!("unix:{}", now.as_secs())
+}
diff --git a/crates/rustapi-core/src/validation.rs b/crates/rustapi-core/src/validation.rs
@@ -10,6 +10,7 @@ pub trait Validatable {
 }
 
 // Blanket implementation for types implementing the external validator::Validate trait
+#[cfg(feature = "legacy-validator")]
 impl<T: validator::Validate> Validatable for T {
     fn do_validate(&self) -> Result<(), ApiError> {
         match validator::Validate::validate(self) {
@@ -20,6 +21,7 @@ impl<T: validator::Validate> Validatable for T {
 }
 
 /// Helper to convert validator::ValidationErrors to rustapi_core::error::ApiError
+#[cfg(feature = "legacy-validator")]
 pub fn convert_validator_errors(errors: validator::ValidationErrors) -> ApiError {
     let field_errors =
         errors
diff --git a/crates/rustapi-extras/Cargo.toml b/crates/rustapi-extras/Cargo.toml
@@ -15,7 +15,7 @@ rustapi-core = { workspace = true }
 rustapi-openapi = { workspace = true }
 
 # Async
-tokio = { workspace = true }
+tokio = { workspace = true, features = ["rt", "sync", "time"] }
 futures-util = { workspace = true }
 async-trait = { workspace = true }
 
diff --git a/crates/rustapi-macros/README.md b/crates/rustapi-macros/README.md
@@ -31,8 +31,8 @@ Enrich your auto-generated documentation.
 
 ### `#[derive(Schema)]`
 Generates a JSON Schema for the struct, used by `rustapi-openapi`.
-*Wraps `utoipa::ToSchema` via `rustapi-openapi` integration.*
+*Uses RustAPI's native OpenAPI schema integration.*
 
 ### `#[derive(Validate)]`
 Generates validation logic.
-*Wraps `validator::Validate` via `rustapi-validate` integration.*
+*Implements RustAPI v2 validation traits via `rustapi-validate` integration.*
diff --git a/crates/rustapi-macros/src/lib.rs b/crates/rustapi-macros/src/lib.rs
@@ -43,7 +43,7 @@ pub fn derive_schema(input: TokenStream) -> TokenStream {
 
 /// Auto-register a schema type for zero-config OpenAPI.
 ///
-/// Attach this to a `struct` or `enum` that also derives `Schema` (utoipa::ToSchema).
+/// Attach this to a `struct` or `enum` that also derives `Schema`.
 /// This ensures the type is registered into RustAPI's OpenAPI components even if it is
 /// only referenced indirectly (e.g. as a nested field type).
 ///
diff --git a/crates/rustapi-openapi/README.md b/crates/rustapi-openapi/README.md
@@ -10,7 +10,7 @@ Automated API specifications and Swagger UI integration for RustAPI.
 ## How It Works
 
 1. **Reflection**: RustAPI macros collect metadata about your routes (path, method, input types, output types) at compile time
-2. **Schema Gen**: Uses `utoipa` to generate JSON Schemas for your Rust structs
+2. **Schema Gen**: Uses RustAPI's native schema engine to generate OpenAPI-compatible JSON Schemas
 3. **Spec Build**: At runtime, assembles the full OpenAPI 3.0 JSON specification
 4. **UI Serve**: Embeds the Swagger UI assets and serves them at your specified path
 
diff --git a/crates/rustapi-openapi/src/lib.rs b/crates/rustapi-openapi/src/lib.rs
@@ -1,8 +1,7 @@
 //! OpenAPI documentation for RustAPI
 //!
 //! This crate provides OpenAPI specification generation and Swagger UI serving
-//! for RustAPI applications. It wraps `utoipa` internally while providing a
-//! clean public API.
+//! for RustAPI applications with a native OpenAPI model and schema engine.
 //!
 //! # Features
 //!
diff --git a/crates/rustapi-rs/Cargo.toml b/crates/rustapi-rs/Cargo.toml
@@ -27,14 +27,13 @@ tokio = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 tracing = { workspace = true }
-validator = { workspace = true }
+validator = { workspace = true, optional = true }
 rustapi-openapi = { workspace = true, default-features = false }
 
 [dev-dependencies]
 rustapi-core = { workspace = true }
 rustapi-macros = { workspace = true }
 tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }
-utoipa = { workspace = true }
 doc-comment = "0.3"
 uuid = { workspace = true, features = ["serde", "v4"] }
 
@@ -45,6 +44,7 @@ swagger-ui = ["rustapi-core/swagger-ui", "rustapi-openapi/swagger-ui"]
 # Performance features
 simd-json = ["rustapi-core/simd-json"]
 tracing = ["rustapi-core/tracing"]
+legacy-validator = ["dep:validator", "rustapi-core/legacy-validator"]
 
 # Compression middleware
 compression = ["rustapi-core/compression"]
@@ -87,4 +87,4 @@ replay = ["dep:rustapi-extras", "rustapi-extras/replay"]
 
 # Meta features
 extras = ["jwt", "cors", "rate-limit"]
-full = ["extras", "config", "cookies", "sqlx", "toon", "insight", "compression", "ws", "view", "timeout", "guard", "logging", "circuit-breaker", "security-headers", "api-key", "cache", "dedup", "sanitization", "otel", "structured-logging", "replay"]
+full = ["extras", "config", "cookies", "sqlx", "toon", "insight", "compression", "ws", "view", "timeout", "guard", "logging", "circuit-breaker", "security-headers", "api-key", "cache", "dedup", "sanitization", "otel", "structured-logging", "replay", "legacy-validator"]
diff --git a/crates/rustapi-rs/src/lib.rs b/crates/rustapi-rs/src/lib.rs
@@ -49,6 +49,7 @@
 //! - `config` - Configuration management with `.env` file support
 //! - `cookies` - Cookie parsing extractor
 //! - `sqlx` - SQLx database error conversion to ApiError
+//! - `legacy-validator` - Compatibility mode for `validator::Validate`
 //! - `extras` - Meta feature enabling jwt, cors, and rate-limit
 //! - `full` - All optional features enabled
 //!
@@ -302,6 +303,7 @@ pub mod prelude {
     // Re-export validation - use validator derive macro directly
     pub use rustapi_validate::v2::AsyncValidate;
     pub use rustapi_validate::v2::Validate as V2Validate;
+    #[cfg(feature = "legacy-validator")]
     pub use validator::Validate;
 
     // Re-export OpenAPI schema derive
diff --git a/crates/rustapi-rs/tests/validation_tests.rs b/crates/rustapi-rs/tests/validation_tests.rs
@@ -7,12 +7,14 @@ use serde::{Deserialize, Serialize};
 // ============================================================================
 
 #[derive(Debug, Deserialize, Serialize, validator::Validate)]
+#[cfg(feature = "legacy-validator")]
 struct LegacyUser {
     #[validate(length(min = 3))]
     name: String,
 }
 
 #[test]
+#[cfg(feature = "legacy-validator")]
 fn test_legacy_validator_compat() {
     let valid_user = LegacyUser {
         name: "Bob".to_string(),
diff --git a/crates/rustapi-view/Cargo.toml b/crates/rustapi-view/Cargo.toml
@@ -30,7 +30,7 @@ http-body-util = { workspace = true }
 bytes = { workspace = true }
 
 # Async
-tokio = { workspace = true }
+tokio = { workspace = true, features = ["sync"] }
 
 # Utilities
 thiserror = { workspace = true }
diff --git a/crates/rustapi-ws/Cargo.toml b/crates/rustapi-ws/Cargo.toml
@@ -29,8 +29,8 @@ futures-util = { workspace = true }
 http = { workspace = true }
 http-body-util = { workspace = true }
 bytes = { workspace = true }
-hyper = { workspace = true }
-hyper-util = { workspace = true }
+hyper = { workspace = true, features = ["server", "http1"] }
+hyper-util = { workspace = true, features = ["tokio"] }
 
 # Serialization (optional, for JSON messages)
 serde = { workspace = true }
diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md
@@ -145,7 +145,7 @@ RustApi::auto().run("0.0.0.0:8080").await
 **Automatic OpenAPI/Swagger generation.**
 
 Features:
-- Wraps `utoipa` internally (not exposed)
+- Native OpenAPI model and schema registry (no external OpenAPI generator dependency)
 - Auto-generates OpenAPI 3.0 spec
 - Serves Swagger UI at `/docs`
 - Extracts schemas from `Json<T>`, `Query<T>`, `Path<T>`
diff --git a/docs/PHILOSOPHY.md b/docs/PHILOSOPHY.md
@@ -96,9 +96,9 @@ validator = "0.16"
 |-----------|----------------|--------------|
 | HTTP Server | `hyper 1.x` | `hyper 2.x`, `h3` (HTTP/3) |
 | Async Runtime | `tokio` | `smol`, `async-std` (future) |
-| Validation | `validator` | Custom engine (planned for v1.0) |
+| Validation | Native RustAPI v2 (legacy optional) | Further optimized native engine |
 | Router | `matchit` | Custom radix tree |
-| OpenAPI | `utoipa` | Native implementation |
+| OpenAPI | Native implementation | Further optimized native implementation |
 
 **Example scenario:** When `hyper 2.0` releases with breaking changes:
 1. We update `rustapi-core` to use `hyper 2.0`
diff --git a/docs/cookbook/src/architecture/system_overview.md b/docs/cookbook/src/architecture/system_overview.md
@@ -121,7 +121,6 @@ graph BT
         Tokio[tokio]
         Hyper[hyper]
         Serde[serde]
-        Utoipa[utoipa]
         Validator[validator]
         Tungstenite[tungstenite]
         Tera[tera]
@@ -140,8 +139,8 @@ graph BT
     Core --> Tokio
     Core --> Hyper
     Core --> Serde
-    OpenAPI --> Utoipa
-    Validate --> Validator
+    OpenAPI --> Serde
+    Validate -.->|legacy optional| Validator
     Toon --> Serde
     WS --> Tungstenite
     View --> Tera
diff --git a/docs/cookbook/src/crates/rustapi_openapi.md b/docs/cookbook/src/crates/rustapi_openapi.md
@@ -5,7 +5,7 @@
 
 ## Automatic Spec Generation
 
-We believe that if documentation is manual, it is wrong. RustAPI uses `utoipa` to generate an OpenAPI 3.0 specification directly from your code.
+We believe that if documentation is manual, it is wrong. RustAPI uses a native OpenAPI generator to build the specification directly from your code.
 
 ## The `Schema` Trait
 
diff --git a/docs/cookbook/src/troubleshooting.md b/docs/cookbook/src/troubleshooting.md
@@ -36,7 +36,7 @@ pub struct ListParams {
 
 ---
 
-## 2. Don't Use `utoipa` Directly
+## 2. Don't Add External OpenAPI Generators Directly
 
 **Wrong:**
 ```toml
@@ -53,7 +53,7 @@ rustapi-rs = { version = "0.1.300", features = ["full"] }
 
 **Why?**
 - RustAPI has its own OpenAPI implementation (`rustapi-openapi`)
-- Adding `utoipa` directly can cause dependency conflicts
+- External OpenAPI derive/macros are not part of RustAPI's public API surface
 - The `Schema` derive macro is already in `rustapi_rs::prelude::*`
 
 ---
@@ -370,7 +370,7 @@ async fn handler(
 ## The Golden Rules
 
 1. **Add `Schema` derive** to any struct used with extractors or responses
-2. **Don't use `utoipa`** directly - `rustapi-openapi` is already included
+2. **Don't add external OpenAPI crates** directly - `rustapi-openapi` is already included
 3. **Import from `rustapi_rs`** only - never use internal crates directly
 4. **Use `RustApi::auto()`** with handler macros for automatic route discovery
 
diff --git a/docs/native_openapi.md b/docs/native_openapi.md
@@ -1,10 +1,10 @@
 # Native OpenAPI Design for RustAPI
 
 ## Overview
-RustAPI is moving to a native OpenAPI 3.1 generator to reduce external dependencies (specifically `utoipa`) and ensure deterministic, high-quality spec generation. This document outlines the architecture for the "Native OpenAPI" implementation.
+RustAPI uses a native OpenAPI 3.1 generator to reduce external dependencies and ensure deterministic, high-quality spec generation. This document outlines the architecture for the "Native OpenAPI" implementation.
 
 ## Goals
-- **Zero Heavy Dependencies**: Remove `utoipa`. Use only `serde` + `serde_json` + standard library.
+- **Zero Heavy Dependencies**: Use only `serde` + `serde_json` + standard library.
 - **OpenAPI 3.1**: Support full JSON Schema 2020-12 compatibility.
 - **Determinism**: Output MUST be stable (sorted keys, stable component names).
 - **Backwards Compatibility**: Maintain existing `RustApi::auto()` experience.

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ pub trait Validatable {`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`// Blanket implementation for types implementing the external validator::Validate trait`
	`13`	`+#[cfg(feature = "legacy-validator")]`
`13`	`14`	`impl<T: validator::Validate> Validatable for T {`
`14`	`15`	`fn do_validate(&self) -> Result<(), ApiError> {`
`15`	`16`	`match validator::Validate::validate(self) {`
`@@ -20,6 +21,7 @@ impl<T: validator::Validate> Validatable for T {`
`20`	`21`	`}`
`21`	`22`
`22`	`23`	`/// Helper to convert validator::ValidationErrors to rustapi_core::error::ApiError`
	`24`	`+#[cfg(feature = "legacy-validator")]`
`23`	`25`	`pub fn convert_validator_errors(errors: validator::ValidationErrors) -> ApiError {`
`24`	`26`	`let field_errors =`
`25`	`27`	`errors`