oxpanel/ox_speak_server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

init

Browse Source
This commit is contained in:
Nell
2025-08-11 16:59:31 +02:00
parent d691c1d944
commit 39d1d9a2b7
14 changed files with 535 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/dataSources.local.xml generated
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="dataSourceStorageLocal" created-in="RR-251.26927.79">
<component name="dataSourceStorageLocal" created-in="RR-252.23892.452">
<data-source name="db.sqlite" uuid="26059583-0fdb-4f6f-ad11-10388e9658c2">
<database-info product="SQLite" version="3.45.1" jdbc-version="4.2" driver-name="SQLite JDBC" driver-version="3.45.1.0" dbms="SQLITE" exact-version="3.45.1" exact-driver-version="3.45">
<identifier-quote-string>&quot;</identifier-quote-string>

41
.idea/workspace.xml generated
View File

@@ -16,15 +16,19 @@
</component>
<component name="ChangeListManager">
<list default="true" id="ca698286-778f-4335-97c8-da35a666c986" name="Changes" comment="init">
<change afterPath="$PROJECT_DIR$/src/network/http_routes/sub_server.rs" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/store/session/client.rs" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/store/session/mod.rs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/dataSources.local.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources.local.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/network/http_routes/mod.rs" beforeDir="false" afterPath="$PROJECT_DIR$/src/network/http_routes/mod.rs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/store/repositories/channel_repository.rs" beforeDir="false" afterPath="$PROJECT_DIR$/src/store/repositories/channel_repository.rs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/store/repositories/link_sub_server_user_repository.rs" beforeDir="false" afterPath="$PROJECT_DIR$/src/store/repositories/link_sub_server_user_repository.rs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/store/repositories/message_repository.rs" beforeDir="false" afterPath="$PROJECT_DIR$/src/store/repositories/message_repository.rs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/store/repositories/sub_server_repository.rs" beforeDir="false" afterPath="$PROJECT_DIR$/src/store/repositories/sub_server_repository.rs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/store/repositories/user_repository.rs" beforeDir="false" afterPath="$PROJECT_DIR$/src/store/repositories/user_repository.rs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/store/store_service.rs" beforeDir="false" afterPath="$PROJECT_DIR$/src/store/store_service.rs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/network/http_routes/channel.rs" beforeDir="false" afterPath="$PROJECT_DIR$/src/network/http_routes/channel.rs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/network/http_routes/message.rs" beforeDir="false" afterPath="$PROJECT_DIR$/src/network/http_routes/message.rs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/network/http_routes/sub_server.rs" beforeDir="false" afterPath="$PROJECT_DIR$/src/network/http_routes/sub_server.rs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/network/http_routes/user.rs" beforeDir="false" afterPath="$PROJECT_DIR$/src/network/http_routes/user.rs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/network/http_routes/websocket.rs" beforeDir="false" afterPath="$PROJECT_DIR$/src/network/http_routes/websocket.rs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/store/mod.rs" beforeDir="false" afterPath="$PROJECT_DIR$/src/store/mod.rs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/store/models/channel.rs" beforeDir="false" afterPath="$PROJECT_DIR$/src/store/models/channel.rs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/store/models/mod.rs" beforeDir="false" afterPath="$PROJECT_DIR$/src/store/models/mod.rs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/store/models/sub_server.rs" beforeDir="false" afterPath="$PROJECT_DIR$/src/store/models/sub_server.rs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/utils/shared_store.rs" beforeDir="false" afterPath="$PROJECT_DIR$/src/utils/shared_store.rs" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
@@ -79,7 +83,8 @@
&quot;org.rust.cargo.project.model.impl.CargoExternalSystemProjectAware.subscribe.first.balloon&quot;: &quot;&quot;,
&quot;org.rust.first.attach.projects&quot;: &quot;true&quot;,
&quot;run.code.analysis.last.selected.profile&quot;: &quot;pProject Default&quot;,
&quot;settings.editor.selected.configurable&quot;: &quot;ml.llm.LLMProjectConfigurable&quot;,
&quot;settings.editor.selected.configurable&quot;: &quot;junie.allowlist&quot;,
&quot;to.speed.mode.migration.done&quot;: &quot;true&quot;,
&quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
},
&quot;keyToStringList&quot;: {
@@ -169,7 +174,13 @@
<workItem from="1754131509073" duration="779000" />
<workItem from="1754132326149" duration="52000" />
<workItem from="1754132390785" duration="5048000" />
<workItem from="1754211612647" duration="2131000" />
<workItem from="1754211612647" duration="13365000" />
<workItem from="1754321796199" duration="4611000" />
<workItem from="1754409493435" duration="2864000" />
<workItem from="1754521183720" duration="4070000" />
<workItem from="1754761637246" duration="1293000" />
<workItem from="1754781483976" duration="3949000" />
<workItem from="1754923017894" duration="1334000" />
</task>
<task id="LOCAL-00001" summary="init">
<option name="closed" value="true" />
@@ -195,7 +206,15 @@
<option name="project" value="LOCAL" />
<updated>1753813204617</updated>
</task>
<option name="localTasksCounter" value="4" />
<task id="LOCAL-00004" summary="init">
<option name="closed" value="true" />
<created>1754213783870</created>
<option name="number" value="00004" />
<option name="presentableId" value="LOCAL-00004" />
<option name="project" value="LOCAL" />
<updated>1754213783870</updated>
</task>
<option name="localTasksCounter" value="5" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">

8
src/network/http_routes/channel.rs
View File

@@ -0,0 +1,8 @@
use axum::Router;
use axum::routing::post;
use crate::network::http::HttpState;
pub fn create_router() -> Router<HttpState> {
Router::new()
// .route("/auth/", post(join_master_server))
}

8
src/network/http_routes/message.rs
View File

@@ -0,0 +1,8 @@
use axum::Router;
use axum::routing::post;
use crate::network::http::HttpState;
pub fn create_router() -> Router<HttpState> {
Router::new()
// .route("/auth/", post(join_master_server))
}

9
src/network/http_routes/sub_server.rs
View File

@@ -0,0 +1,9 @@
use axum::Router;
use axum::routing::post;
use crate::network::http::HttpState;
pub fn create_router() -> Router<HttpState> {
Router::new()
// .route("/auth/", post(join_master_server))
}

8
src/network/http_routes/user.rs
View File

@@ -0,0 +1,8 @@
use axum::Router;
use axum::routing::post;
use crate::network::http::HttpState;
pub fn create_router() -> Router<HttpState> {
Router::new()
// .route("/auth/", post(join_master_server))
}

8
src/network/http_routes/websocket.rs
View File

@@ -0,0 +1,8 @@
use axum::Router;
use axum::routing::post;
use crate::network::http::HttpState;
pub fn create_router() -> Router<HttpState> {
Router::new()
// .route("/auth/", post(join_master_server))
}

3
src/store/mod.rs
View File

@@ -1,3 +1,4 @@
pub mod models;
pub mod repositories;
pub mod store_service;
pub mod store_service;
mod session;

15
src/store/models/channel.rs
View File

@@ -1,3 +1,4 @@
use std::hash::{Hash, Hasher};
// use chrono::{DateTime, Utc};
use serde::{Deserialize, Serialize};
// use uuid::Uuid;
@@ -29,4 +30,18 @@ impl Channel {
created_at: Utc::now(),
}
}
}
impl PartialEq for Channel {
fn eq(&self, other: &Self) -> bool {
self.id == other.id
}
}
impl Eq for Channel {}
impl Hash for Channel {
fn hash<H: Hasher>(&self, state: &mut H) {
self.id.hash(state);
}
}

1
src/store/models/mod.rs
View File

@@ -3,6 +3,7 @@ pub mod channel;
pub mod user;
pub mod message;
pub mod link_sub_server_user;
mod models;
pub use sub_server::*;
pub use channel::*;

16
src/store/models/sub_server.rs
View File

@@ -1,8 +1,10 @@
// L'application peut avoir plusieurs sous servers
use std::hash::{Hash, Hasher};
use chrono::{DateTime, Utc};
use serde::{Deserialize, Serialize};
use uuid::Uuid;
use crate::store::models::Channel;
#[derive(Debug, Clone, sqlx::FromRow, Serialize, Deserialize)]
pub struct SubServer {
@@ -21,4 +23,18 @@ impl SubServer {
created_at: Utc::now(),
}
}
}
impl PartialEq for SubServer {
fn eq(&self, other: &Self) -> bool {
self.id == other.id
}
}
impl Eq for SubServer {}
impl Hash for SubServer {
fn hash<H: Hasher>(&self, state: &mut H) {
self.id.hash(state);
}
}

234
src/store/session/client.rs Normal file
View File

@@ -0,0 +1,234 @@
use std::collections::{HashMap, HashSet};
use std::hash::{Hash, Hasher};
use std::net::SocketAddr;
use std::sync::{Arc, Weak};
use std::time::Instant;
use axum::extract::ws::WebSocket;
use uuid::Uuid;
use crate::store::models::{Channel, SubServer};
use crate::store::models::user::User;
use crate::utils::shared_store::{SharedArcHashSet, SharedArcMap, SharedArcVec};
/// Représente un client connecté au serveur (WebSocket + optionnel UDP)
///
/// Chaque client a une connexion WebSocket obligatoire et peut avoir une connexion UDP
/// pour la voix s'il rejoint un channel vocal.
#[derive(Debug)]
pub struct Client {
// ===== CHAMPS IMMUTABLES =====
pub session_id: Uuid,
pub user: User,
pub websocket: WebSocket,
pub created_at: Instant,
// ===== CHAMPS MUTABLES =====
pub udp_socket: Option<SocketAddr>,
pub voice_channel: Option<Channel>,
// ===== RÉFÉRENCES INTERNES =====
/// Référence faible vers le manager pour l'auto-nettoyage
manager: Option<Weak<ClientManager>>,
}
impl Client {
/// Crée un nouveau client
pub fn new(user: User, websocket: WebSocket) -> Self {
Self {
session_id: Uuid::new_v4(),
user,
websocket,
created_at: Instant::now(),
udp_socket: None,
voice_channel: None,
manager: None,
}
}
// ===== MÉTHODES MUTABLES INTERNES =====
// Ces méthodes sont pub(crate) - elles ne doivent être appelées que via ClientManager::modify_client()
/// Configure l'adresse UDP (méthode interne)
pub(crate) fn set_udp_socket(&mut self, udp_socket: SocketAddr) {
self.udp_socket = Some(udp_socket);
}
/// Supprime l'adresse UDP (méthode interne)
pub(crate) fn remove_udp_socket(&mut self) {
self.udp_socket = None;
}
/// Configure la référence vers le manager (appelé par le manager)
pub(crate) fn set_manager(&mut self, manager: Weak<ClientManager>) {
self.manager = Some(manager);
}
}
impl PartialEq for Client {
fn eq(&self, other: &Self) -> bool {
self.session_id == other.session_id
}
}
impl Eq for Client {}
impl Hash for Client {
fn hash<H: Hasher>(&self, state: &mut H) {
self.session_id.hash(state);
}
}
/// Nettoyage automatique quand le client est détruit
impl Drop for Client {
fn drop(&mut self) {
if let Some(manager) = self.manager.as_ref().and_then(|w| w.upgrade()) {
manager.cleanup_client_index(&self);
}
}
}
// =========================================================================
// CLIENT MANAGER
// =========================================================================
/// Gestionnaire centralisé de tous les clients connectés
///
/// Maintient les clients et leurs index pour des recherches efficaces.
/// Thread-safe via SharedArcMap.
pub struct ClientManager {
/// Map principale des clients par session_id
clients: SharedArcMap<Uuid, Client>,
// ===== INDEX POUR RECHERCHES RAPIDES =====
/// Index des clients par channel_id
voice_channel_clients: SharedArcMap<Channel, SharedArcHashSet<Client>>, // channel_id -> HashSet<session_id>
/// Index des clients par sub_server_id
sub_server_clients: SharedArcMap<Uuid, SharedArcVec<Client>>, // sub_server_id -> Vec<session_id>
/// Index des clients par adresse UDP
udp_clients: SharedArcMap<SocketAddr, String>, // udp_address -> session_id
}
impl ClientManager {
/// Crée un nouveau gestionnaire de clients
pub fn new() -> Self {
Self {
clients: SharedArcMap::new(),
voice_channel_clients: SharedArcMap::new(),
sub_server_clients: SharedArcMap::new(),
udp_clients: SharedArcMap::new(),
}
}
// ===== GESTION DES CLIENTS =====
/// Ajoute un nouveau client au gestionnaire
pub fn add_client(self: &Arc<Self>, mut client: Client) -> Arc<Client> {
let session_id = client.session_id.clone();
// Lier le client au manager pour l'auto-nettoyage
client.set_manager(Arc::downgrade(self));
// Stocker et retourner
let arc_client = Arc::new(client);
self.clients.insert_arc(session_id, arc_client.clone());
arc_client
}
/// Obtient un client par son session_id
pub fn get_client(&self, session_id: &Uuid) -> Option<Arc<Client>> {
// Convertir &str en String pour les clés
self.clients.get(session_id)
}
/// Obtient tous les clients connectés
pub fn get_all_clients(&self) -> Vec<Arc<Client>> {
self.clients.values().collect()
}
// ===== OPÉRATIONS DE MODIFICATION =====
/// Modifie un client via une closure thread-safe
///
/// Cette méthode garantit que la modification est atomique et que
/// les index restent cohérents avec l'état du client.
///
/// # Arguments
/// * `session_id` - L'ID de session du client à modifier
/// * `f` - La closure qui recevra une référence mutable vers le client
///
/// # Returns
/// `true` si le client a été trouvé et modifié, `false` sinon
pub fn modify_client<F>(&self, session_id: &str, f: F) -> bool
where
F: FnOnce(&mut Client),
{
// Convertir &str en String pour les clés
self.clients.modify(&session_id.to_string(), f)
}
// ===== OPÉRATIONS ATOMIQUES HAUT NIVEAU =====
// Nettoie tous les index d'un client (appelé lors de la suppression)
// pub(crate) fn cleanup_client_indexes(&self, session_id: &str) {
// if let Some(client) = self.get_client(session_id) {
// // Nettoyer l'index des channels
// if let Some(channel_id) = client.current_channel {
// self.remove_from_channel_index(session_id, channel_id);
// }
//
// // Nettoyer l'index des sub-servers
// if let Some(sub_server_id) = client.current_sub_server {
// self.remove_from_sub_server_index(session_id, sub_server_id);
// }
//
// // Nettoyer l'index UDP
// if let Some(udp_address) = client.udp_socket {
// self.udp_clients.remove(&udp_address);
// }
// }
// }
}
impl ClientManager {
// Delete methods
/// Supprime tous les index d'un client
pub fn cleanup_client_index(&self, client: &Client) {
if let Some(channel) = client.voice_channel.as_ref() {
self.remove_client_from_voice_channel(channel, client);
}
}
/// Supprime un client du gestionnaire
pub fn remove_client(&self, session_id: &Uuid) {
// Convertir &str en String pour les clés
if let Some(client) = self.clients.get(session_id) {
// Nettoyer tous les index
self.cleanup_client_index(&client);
// Supprimer le client de la liste principale
self.clients.remove(&session_id);
}
}
pub fn remove_client_from_voice_channel(&self, voice_channel: &Channel, client: &Client) {
if let Some(channel) = self.voice_channel_clients.get(voice_channel) {
channel.remove(client);
}
}
pub fn remove_client_from_sub_servers(&self, client: &Client) {
for (sub_server, clients) in self.sub_server_clients.iter() {
let mut to_remove = Vec::<usize>::new();
for (index, client) in clients.iter().enumerate() {
if client == client {
to_remove.push(index);
}
}
for idx in to_remove.iter() {
clients.
}
}
}
}

1
src/store/session/mod.rs Normal file
View File

@@ -0,0 +1 @@
mod client;

194
src/utils/shared_store.rs
View File

@@ -244,6 +244,90 @@ impl<T> SharedVec<T> {
self.inner.store(Arc::new(new_vec));
}
/// Supprime l'élément à l'index donné et le retourne.
/// Retourne `None` si l'index est hors limites.
pub fn delete(&self, index: usize) -> Option<T>
where
T: Clone,
{
loop {
let current = self.inner.load();
if index >= current.len() {
return None;
}
let mut new_vec = current.as_ref().clone();
let removed_item = new_vec.remove(index);
let new_arc = Arc::new(new_vec);
if self.inner.compare_and_swap(&current, new_arc).is_ok() {
return Some(removed_item);
}
// Retry si le CAS a échoué
}
}
/// Supprime et retourne le dernier élément du vecteur.
/// Retourne `None` si le vecteur est vide.
pub fn pop(&self) -> Option<T>
where
T: Clone,
{
loop {
let current = self.inner.load();
if current.is_empty() {
return None;
}
let mut new_vec = current.as_ref().clone();
let popped_item = new_vec.pop();
let new_arc = Arc::new(new_vec);
if self.inner.compare_and_swap(&current, new_arc).is_ok() {
return popped_item;
}
// Retry si le CAS a échoué
}
}
/// Supprime tous les éléments qui correspondent au prédicat donné.
/// Retourne le nombre d'éléments supprimés.
pub fn delete_matching<F>(&self, predicate: F) -> usize
where
T: Clone,
F: Fn(&T) -> bool,
{
loop {
let current = self.inner.load();
let mut new_vec = Vec::with_capacity(current.len());
let mut removed_count = 0;
for item in current.iter() {
if predicate(item) {
removed_count += 1;
} else {
new_vec.push(item.clone());
}
}
if removed_count == 0 {
return 0;
}
let new_arc = Arc::new(new_vec);
if self.inner.compare_and_swap(&current, new_arc).is_ok() {
return removed_count;
}
// Retry si le CAS a échoué
}
}
/// Clear optimisé
///
/// Exemple : `clients.clear(); // Vide la liste`
@@ -852,6 +936,116 @@ impl<T> SharedArcVec<T> {
self.inner.store(Arc::new(Vec::new()));
}
/// Supprime l'élément à l'index donné et le retourne.
/// Retourne `None` si l'index est hors limites.
pub fn delete(&self, index: usize) -> Option<Arc<T>> {
loop {
let current = self.inner.load();
if index >= current.len() {
return None;
}
let mut new_vec = current.as_ref().clone();
let removed_item = new_vec.remove(index);
let new_arc = Arc::new(new_vec);
if self.inner.compare_and_swap(&current, new_arc).is_ok() {
return Some(removed_item);
}
// Retry si le CAS a échoué
}
}
/// Supprime et retourne le dernier élément du vecteur.
/// Retourne `None` si le vecteur est vide.
pub fn pop(&self) -> Option<Arc<T>> {
loop {
let current = self.inner.load();
if current.is_empty() {
return None;
}
let mut new_vec = current.as_ref().clone();
let popped_item = new_vec.pop();
let new_arc = Arc::new(new_vec);
if self.inner.compare_and_swap(&current, new_arc).is_ok() {
return popped_item;
}
// Retry si le CAS a échoué
}
}
/// Supprime tous les éléments qui correspondent au prédicat donné.
/// Retourne le nombre d'éléments supprimés.
pub fn delete_matching<F>(&self, predicate: F) -> usize
where
F: Fn(&T) -> bool,
{
loop {
let current = self.inner.load();
let mut new_vec = Vec::with_capacity(current.len());
let mut removed_count = 0;
for item in current.iter() {
if predicate(item.as_ref()) {
removed_count += 1;
} else {
new_vec.push(item.clone());
}
}
if removed_count == 0 {
return 0;
}
let new_arc = Arc::new(new_vec);
if self.inner.compare_and_swap(&current, new_arc).is_ok() {
return removed_count;
}
// Retry si le CAS a échoué
}
}
/// Supprime le premier élément trouvé qui correspond au prédicat.
/// Retourne `Some(Arc<T>)` si un élément a été trouvé et supprimé, `None` sinon.
pub fn delete_first_matching<F>(&self, predicate: F) -> Option<Arc<T>>
where
F: Fn(&T) -> bool,
{
loop {
let current = self.inner.load();
let mut found_index = None;
for (index, item) in current.iter().enumerate() {
if predicate(item.as_ref()) {
found_index = Some(index);
break;
}
}
if let Some(index) = found_index {
let mut new_vec = current.as_ref().clone();
let removed_item = new_vec.remove(index);
let new_arc = Arc::new(new_vec);
if self.inner.compare_and_swap(&current, new_arc).is_ok() {
return Some(removed_item);
}
// Retry si le CAS a échoué
} else {
return None;
}
}
}
/// Iteration retournant Arc<T>
pub fn iter(&self) -> impl Iterator<Item = Arc<T>> + '_ {
let vec_ref = self.inner.load_full();