cjw/Oxicloud
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

perf: enable HTTP/2, remove redundant hyper dep, use async RwLock

Browse Source 
- Enable HTTP/2 auto-detection in axum (add 'http2' feature)
- Remove direct hyper dependency with 'full' features (already transitive via axum/reqwest)
- Replace std::sync::RwLock with tokio::sync::RwLock in oidc_service.rs and file_system_i18n_service.rs to prevent async deadlocks
This commit is contained in:
Dionisio
2026-03-05 18:27:13 +01:00
parent 4d81bcbd7b
commit 56d73d1fc6
4 changed files with 14 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/infrastructure/services/file_system_i18n_service.rs
+4 -4
View File
@@ -1,7 +1,7 @@
use serde_json::Value;
use std::collections::HashMap;
use std::path::PathBuf;
use std::sync::RwLock;
use tokio::sync::RwLock;
use tokio::fs;
use crate::domain::services::i18n_service::{I18nError, I18nResult, I18nService, Locale};
@@ -66,7 +66,7 @@ impl I18nService for FileSystemI18nService {
async fn translate(&self, key: &str, locale: Locale) -> I18nResult<String> {
// Check if translations are cached
{
let cache = self.cache.read().unwrap();
let cache = self.cache.read().await;
if let Some(translations) = cache.get(&locale) {
if let Some(value) = self.get_nested_value(translations, key) {
return Ok(value);
@@ -88,7 +88,7 @@ impl I18nService for FileSystemI18nService {
self.load_translations(locale).await?;
{
let cache = self.cache.read().unwrap();
let cache = self.cache.read().await;
if let Some(translations) = cache.get(&locale) {
if let Some(value) = self.get_nested_value(translations, key) {
return Ok(value);
@@ -131,7 +131,7 @@ impl I18nService for FileSystemI18nService {
// Update cache
{
let mut cache = self.cache.write().unwrap();
let mut cache = self.cache.write().await;
cache.insert(locale, translations);
}
src/infrastructure/services/oidc_service.rs
+5 -17
View File
@@ -6,7 +6,7 @@
//! Compatible with Authentik, Keycloak, and any standard OIDC provider.
use serde::Deserialize;
use std::sync::RwLock;
use tokio::sync::RwLock;
use std::time::{Duration, Instant};
use crate::application::ports::auth_ports::{OidcIdClaims, OidcServicePort, OidcTokenSet};
@@ -144,10 +144,7 @@ impl OidcService {
async fn get_discovery(&self) -> Result<OidcDiscovery, DomainError> {
// Check cache first (return cached value only if not expired)
{
let cache = self
.discovery
.read()
.map_err(|_| DomainError::new(ErrorKind::InternalError, "OIDC", "Lock poisoned"))?;
let cache = self.discovery.read().await;
if let Some(ref cached) = *cache {
if !cached.is_expired() {
return Ok(cached.value.clone());
@@ -193,10 +190,7 @@ impl OidcService {
// Cache it with timestamp
{
let mut cache = self
.discovery
.write()
.map_err(|_| DomainError::new(ErrorKind::InternalError, "OIDC", "Lock poisoned"))?;
let mut cache = self.discovery.write().await;
*cache = Some(Cached::new(discovery.clone()));
}
@@ -207,10 +201,7 @@ impl OidcService {
async fn get_jwks(&self) -> Result<JwksDocument, DomainError> {
// Check cache first (return cached value only if not expired)
{
let cache = self
.jwks
.read()
.map_err(|_| DomainError::new(ErrorKind::InternalError, "OIDC", "Lock poisoned"))?;
let cache = self.jwks.read().await;
if let Some(ref cached) = *cache {
if !cached.is_expired() {
return Ok(cached.value.clone());
@@ -246,10 +237,7 @@ impl OidcService {
// Cache it with timestamp
{
let mut cache = self
.jwks
.write()
.map_err(|_| DomainError::new(ErrorKind::InternalError, "OIDC", "Lock poisoned"))?;
let mut cache = self.jwks.write().await;
*cache = Some(Cached::new(jwks.clone()));
}