mirror of
https://github.com/fawney19/Aether.git
synced 2026-10-08 02:17:46 +08:00
refactor(workspace): enforce layered crate boundaries
This commit is contained in:
@@ -2,15 +2,16 @@ use std::collections::HashMap;
|
||||
use std::sync::atomic::AtomicU64;
|
||||
use std::sync::Arc;
|
||||
use std::sync::Mutex as StdMutex;
|
||||
use std::time::Duration;
|
||||
use std::time::{Duration, Instant};
|
||||
|
||||
use aether_data::repository::users::StoredUserGroup;
|
||||
use aether_data_contracts::repository::billing::UserDailyQuotaAvailabilityRecord;
|
||||
use aether_data_contracts::repository::quota::StoredProviderQuotaSnapshot;
|
||||
use aether_data_contracts::repository::usage::UsageCounterHealthSnapshot;
|
||||
use aether_runtime::ConcurrencyGate;
|
||||
use aether_runtime_state::{RuntimeSemaphore, RuntimeState};
|
||||
use dashmap::DashMap;
|
||||
use tokio::sync::{Mutex as TokioMutex, Semaphore};
|
||||
use tokio::sync::{Mutex as TokioMutex, RwLock as TokioRwLock, Semaphore};
|
||||
|
||||
use super::super::async_task::{VideoTaskPollerConfig, VideoTaskService};
|
||||
use super::super::cache::{
|
||||
@@ -106,6 +107,8 @@ pub(crate) struct FrontdoorRuntimeGuardConfig {
|
||||
pub(crate) upstream_target_gate_limit: Option<usize>,
|
||||
}
|
||||
|
||||
pub(crate) const METRIC_SNAPSHOT_TTL: Duration = Duration::from_secs(2);
|
||||
|
||||
impl FrontdoorRuntimeGuardConfig {
|
||||
pub(crate) fn from_env() -> Self {
|
||||
Self {
|
||||
@@ -364,6 +367,8 @@ pub struct AppState {
|
||||
#[cfg(test)]
|
||||
pub(crate) execution_runtime_sync_override: Option<TestExecutionRuntimeSyncOverride>,
|
||||
pub(crate) data: Arc<GatewayDataState>,
|
||||
pub(crate) background_data: Arc<GatewayDataState>,
|
||||
pub(crate) background_data_isolated: bool,
|
||||
pub(crate) runtime_state: Arc<RuntimeState>,
|
||||
pub(crate) usage_runtime: Arc<usage::UsageRuntime>,
|
||||
pub(crate) video_tasks: Arc<VideoTaskService>,
|
||||
@@ -412,6 +417,13 @@ pub struct AppState {
|
||||
pub(crate) usage_counter_flush_metrics: Arc<UsageCounterFlushRuntimeMetrics>,
|
||||
pub(crate) task_supervisor_metrics: TaskSupervisorMetrics,
|
||||
pub(crate) process_resource_monitor: Arc<crate::process_metrics::GatewayProcessResourceMonitor>,
|
||||
pub(crate) metric_snapshot:
|
||||
Arc<TokioRwLock<Option<(Instant, Vec<aether_runtime::MetricSample>)>>>,
|
||||
pub(crate) metric_snapshot_refresh: Arc<TokioMutex<()>>,
|
||||
pub(crate) usage_counter_exact_health_metric_snapshot:
|
||||
Arc<TokioRwLock<Option<(Instant, UsageCounterHealthSnapshot)>>>,
|
||||
pub(crate) usage_counter_exact_health_metric_last_attempt: Arc<StdMutex<Option<Instant>>>,
|
||||
pub(crate) usage_counter_exact_health_metric_refresh: Arc<TokioMutex<()>>,
|
||||
pub(crate) request_candidate_queue: Option<Arc<RequestCandidateQueueRuntime>>,
|
||||
pub(crate) frontdoor_cors: Option<Arc<FrontdoorCorsConfig>>,
|
||||
pub(crate) frontdoor_user_rpm: Arc<FrontdoorUserRpmLimiter>,
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -13,7 +13,7 @@ const AUTH_API_KEY_SNAPSHOT_RUNTIME_CACHE_TTL: Duration = Duration::from_secs(30
|
||||
use super::super::super::{AUTH_API_KEY_LAST_USED_MAX_ENTRIES, AUTH_API_KEY_LAST_USED_TTL};
|
||||
|
||||
impl AppState {
|
||||
async fn acquire_auth_snapshot_load_gate(
|
||||
pub(crate) async fn acquire_auth_snapshot_load_gate(
|
||||
&self,
|
||||
) -> Result<Option<aether_runtime::ConcurrencyPermit>, GatewayError> {
|
||||
let Some(gate) = self.auth_snapshot_load_gate.as_ref() else {
|
||||
|
||||
@@ -525,12 +525,27 @@ impl AppState {
|
||||
}
|
||||
let ttl = self.frontdoor_runtime_guards.auth_capacity_cache_ttl;
|
||||
if ttl.is_zero() {
|
||||
return self.find_user_daily_quota_availability(user_id).await;
|
||||
return self
|
||||
.find_user_daily_quota_availability_for_auth_uncached(user_id)
|
||||
.await;
|
||||
}
|
||||
self.auth_daily_quota_availability_cache
|
||||
.get_or_load(user_id.to_string(), ttl, || async move {
|
||||
let _permit = self.acquire_auth_snapshot_load_gate().await?;
|
||||
self.find_user_daily_quota_availability(user_id).await
|
||||
})
|
||||
.await
|
||||
}
|
||||
|
||||
pub(crate) async fn find_user_daily_quota_availability_for_auth_uncached(
|
||||
&self,
|
||||
user_id: &str,
|
||||
) -> Result<Option<UserDailyQuotaAvailabilityRecord>, GatewayError> {
|
||||
let user_id = user_id.trim();
|
||||
if user_id.is_empty() {
|
||||
return Ok(None);
|
||||
}
|
||||
let _permit = self.acquire_auth_snapshot_load_gate().await?;
|
||||
self.find_user_daily_quota_availability(user_id).await
|
||||
}
|
||||
}
|
||||
|
||||
@@ -181,6 +181,16 @@ impl AppState {
|
||||
.map_err(|err| GatewayError::Internal(err.to_string()))
|
||||
}
|
||||
|
||||
pub(crate) async fn summarize_dashboard_stats(
|
||||
&self,
|
||||
query: &usage::UsageDashboardSummaryQuery,
|
||||
) -> Result<usage::StoredUsageDashboardStatsSummary, GatewayError> {
|
||||
self.data
|
||||
.summarize_dashboard_stats(query)
|
||||
.await
|
||||
.map_err(|err| GatewayError::Internal(err.to_string()))
|
||||
}
|
||||
|
||||
pub(crate) async fn list_dashboard_daily_breakdown(
|
||||
&self,
|
||||
query: &usage::UsageDashboardDailyBreakdownQuery,
|
||||
|
||||
@@ -73,15 +73,16 @@ impl AppState {
|
||||
|
||||
let ttl = self.frontdoor_runtime_guards.auth_capacity_cache_ttl;
|
||||
if ttl.is_zero() {
|
||||
return self.find_wallet(lookup).await;
|
||||
return self
|
||||
.read_wallet_snapshot_for_auth_uncached(user_id, api_key_id, api_key_is_standalone)
|
||||
.await;
|
||||
}
|
||||
|
||||
self.auth_wallet_snapshot_cache
|
||||
.get_or_load(
|
||||
cache_key,
|
||||
ttl,
|
||||
|| async move { self.find_wallet(lookup).await },
|
||||
)
|
||||
.get_or_load(cache_key, ttl, || async move {
|
||||
let _permit = self.acquire_auth_snapshot_load_gate().await?;
|
||||
self.find_wallet(lookup).await
|
||||
})
|
||||
.await
|
||||
}
|
||||
|
||||
@@ -117,6 +118,7 @@ impl AppState {
|
||||
return Ok(None);
|
||||
};
|
||||
|
||||
let _permit = self.acquire_auth_snapshot_load_gate().await?;
|
||||
self.find_wallet(lookup).await
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user