studio/tuwunel
2
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Services refactor

Browse Source 
Replace structs of Dep<Service> with OnceServices, so each service has a Services reference

Remove service name => Service map

Flatten Services.rooms

Make reqwest Clients lazy initialized (client service)
This commit is contained in:
dasha_uwu
2025-08-22 20:15:54 +05:00
parent 26b3a84b88
commit b5890b9664
118 changed files with 457 additions and 1923 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/service/users/keys.rs
View File

@@ -343,15 +343,15 @@ pub async fn mark_device_key_update(&self, user_id: &UserId) {
let count = self.services.globals.next_count();
self.services
.state_cache
.rooms_joined(user_id)
// Don't send key updates to unencrypted rooms
.filter(|room_id| self.services.state_accessor.is_encrypted_room(room_id))
.ready_for_each(|room_id| {
let key = (room_id, *count);
self.db.keychangeid_userid.put_raw(key, user_id);
})
.await;
.state_cache
.rooms_joined(user_id)
// Don't send key updates to unencrypted rooms
.filter(|room_id| self.services.state_accessor.is_encrypted_room(room_id))
.ready_for_each(|room_id| {
let key = (room_id, *count);
self.db.keychangeid_userid.put_raw(key, user_id);
})
.await;
let key = (user_id, *count);
self.db.keychangeid_userid.put_raw(key, user_id);

24
src/service/users/mod.rs
View File

@@ -12,28 +12,18 @@ use ruma::{
events::{GlobalAccountDataEventType, ignored_user_list::IgnoredUserListEvent},
};
use tuwunel_core::{
Err, Result, Server, debug_warn, err, is_equal_to, trace,
Err, Result, debug_warn, err, is_equal_to, trace,
utils::{self, ReadyExt, stream::TryIgnore},
};
use tuwunel_database::{Deserialized, Json, Map};
pub use self::keys::parse_master_key;
use crate::{Dep, account_data, admin, globals, rooms};
pub struct Service {
services: Services,
services: Arc<crate::services::OnceServices>,
db: Data,
}
struct Services {
server: Arc<Server>,
account_data: Dep<account_data::Service>,
admin: Dep<admin::Service>,
globals: Dep<globals::Service>,
state_accessor: Dep<rooms::state_accessor::Service>,
state_cache: Dep<rooms::state_cache::Service>,
}
struct Data {
keychangeid_userid: Arc<Map>,
keyid_key: Arc<Map>,
@@ -62,15 +52,7 @@ struct Data {
impl crate::Service for Service {
fn build(args: crate::Args<'_>) -> Result<Arc<Self>> {
Ok(Arc::new(Self {
services: Services {
server: args.server.clone(),
account_data: args.depend::<account_data::Service>("account_data"),
admin: args.depend::<admin::Service>("admin"),
globals: args.depend::<globals::Service>("globals"),
state_accessor: args
.depend::<rooms::state_accessor::Service>("rooms::state_accessor"),
state_cache: args.depend::<rooms::state_cache::Service>("rooms::state_cache"),
},
services: args.services.clone(),
db: Data {
keychangeid_userid: args.db["keychangeid_userid"].clone(),
keyid_key: args.db["keyid_key"].clone(),