Merge commit '4b7be20fe0cce3e7979cc3bdfdd7b02ec6630c00' into dev

This commit is contained in:
mofeng-git
2026-06-15 22:26:22 +08:00
20 changed files with 2518 additions and 2 deletions

View File

@@ -4,6 +4,7 @@ use tokio::sync::{broadcast, watch, Mutex, RwLock};
use crate::atx::AtxController;
use crate::audio::AudioController;
use crate::auth::{SessionStore, UserStore};
use crate::computer_use::ComputerUseManager;
use crate::config::ConfigStore;
use crate::db::DatabasePool;
use crate::events::{
@@ -67,6 +68,7 @@ pub struct AppState {
pub stream_manager: Arc<VideoStreamManager>,
pub webrtc: Arc<WebRtcStreamer>,
pub hid: Arc<HidController>,
pub computer_use: Arc<ComputerUseManager>,
#[cfg(unix)]
pub msd: Arc<RwLock<Option<MsdController>>>,
pub atx: Arc<RwLock<Option<AtxController>>>,
@@ -95,6 +97,7 @@ impl AppState {
stream_manager: Arc<VideoStreamManager>,
webrtc: Arc<WebRtcStreamer>,
hid: Arc<HidController>,
computer_use: Arc<ComputerUseManager>,
#[cfg(unix)] msd: Option<MsdController>,
atx: Option<AtxController>,
audio: Arc<AudioController>,
@@ -119,6 +122,7 @@ impl AppState {
stream_manager,
webrtc,
hid,
computer_use,
#[cfg(unix)]
msd: Arc::new(RwLock::new(msd)),
atx: Arc::new(RwLock::new(atx)),