Services refactor

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)

src/api/client/room/aliases.rs

@@ -18,7 +18,6 @@ pub(crate) async fn get_room_aliases_route(
 	let sender_user = body.sender_user();
 
 	if !services
-		.rooms
 		.state_accessor
 		.user_can_see_state_events(sender_user, &body.room_id)
 		.await
@@ -28,7 +27,6 @@ pub(crate) async fn get_room_aliases_route(
 
 	Ok(aliases::v3::Response {
 		aliases: services
-			.rooms
 			.alias
 			.local_aliases_for_room(&body.room_id)
 			.map(ToOwned::to_owned)

src/api/client/room/create.rs

@@ -114,7 +114,6 @@ pub(crate) async fn create_room_route(
 	// 2. Let the room creator join
 	let sender_user = body.sender_user();
 	services
-		.rooms
 		.timeline
 		.build_and_append_pdu(
 			PduBuilder::state(sender_user.to_string(), &RoomMemberEventContent {
@@ -176,7 +175,6 @@ pub(crate) async fn create_room_route(
 	)?;
 
 	services
-		.rooms
 		.timeline
 		.build_and_append_pdu(
 			PduBuilder {
@@ -195,7 +193,6 @@ pub(crate) async fn create_room_route(
 	// 4. Canonical room alias
 	if let Some(room_alias_id) = &alias {
 		services
-			.rooms
 			.timeline
 			.build_and_append_pdu(
 				PduBuilder::state(String::new(), &RoomCanonicalAliasEventContent {
@@ -214,7 +211,6 @@ pub(crate) async fn create_room_route(
 
 	// 5.1 Join Rules
 	services
-		.rooms
 		.timeline
 		.build_and_append_pdu(
 			PduBuilder::state(
@@ -234,7 +230,6 @@ pub(crate) async fn create_room_route(
 
 	// 5.2 History Visibility
 	services
-		.rooms
 		.timeline
 		.build_and_append_pdu(
 			PduBuilder::state(
@@ -250,7 +245,6 @@ pub(crate) async fn create_room_route(
 
 	// 5.3 Guest Access
 	services
-		.rooms
 		.timeline
 		.build_and_append_pdu(
 			PduBuilder::state(
@@ -299,7 +293,6 @@ pub(crate) async fn create_room_route(
 		}
 
 		services
-			.rooms
 			.timeline
 			.build_and_append_pdu(pdu_builder, sender_user, &room_id, &state_lock)
 			.boxed()
@@ -309,7 +302,6 @@ pub(crate) async fn create_room_route(
 	// 7. Events implied by name and topic
 	if let Some(name) = &body.name {
 		services
-			.rooms
 			.timeline
 			.build_and_append_pdu(
 				PduBuilder::state(String::new(), &RoomNameEventContent::new(name.clone())),
@@ -323,7 +315,6 @@ pub(crate) async fn create_room_route(
 
 	if let Some(topic) = &body.topic {
 		services
-			.rooms
 			.timeline
 			.build_and_append_pdu(
 				PduBuilder::state(String::new(), &RoomTopicEventContent {
@@ -371,13 +362,12 @@ pub(crate) async fn create_room_route(
 	// Homeserver specific stuff
 	if let Some(alias) = alias {
 		services
-			.rooms
 			.alias
 			.set_alias(&alias, &room_id, sender_user)?;
 	}
 
 	if body.visibility == room::Visibility::Public {
-		services.rooms.directory.set_public(&room_id);
+		services.directory.set_public(&room_id);
 
 		if services.server.config.admin_room_notices {
 			services
@@ -463,9 +453,8 @@ async fn create_create_event(
 
 	// 1. The room create event, using a placeholder room_id
 	let room_id = ruma::room_id!("!thiswillbereplaced").to_owned();
-	let state_lock = services.rooms.state.mutex.lock(&room_id).await;
+	let state_lock = services.state.mutex.lock(&room_id).await;
 	let create_event_id = services
-		.rooms
 		.timeline
 		.build_and_append_pdu(
 			PduBuilder {
@@ -485,7 +474,7 @@ async fn create_create_event(
 
 	// The real room_id is now the event_id.
 	let room_id = OwnedRoomId::from_parts('!', create_event_id.localpart(), None)?;
-	let state_lock = services.rooms.state.mutex.lock(&room_id).await;
+	let state_lock = services.state.mutex.lock(&room_id).await;
 
 	Ok((room_id, state_lock))
 }
@@ -501,10 +490,9 @@ async fn create_create_event_legacy(
 		| Some(custom_id) => custom_room_id_check(services, custom_id).await?,
 	};
 
-	let state_lock = services.rooms.state.mutex.lock(&room_id).await;
+	let state_lock = services.state.mutex.lock(&room_id).await;
 
 	let _short_id = services
-		.rooms
 		.short
 		.get_or_create_shortroomid(&room_id)
 		.await;
@@ -567,7 +555,6 @@ async fn create_create_event_legacy(
 
 	// 1. The room create event
 	services
-		.rooms
 		.timeline
 		.build_and_append_pdu(
 			PduBuilder {
@@ -681,7 +668,6 @@ async fn room_alias_check(
 		})?;
 
 	if services
-		.rooms
 		.alias
 		.resolve_local_alias(&full_room_alias)
 		.await
@@ -740,7 +726,6 @@ async fn custom_room_id_check(services: &Services, custom_room_id: &str) -> Resu
 
 	// check if room ID doesn't already exist instead of erroring on auth check
 	if services
-		.rooms
 		.short
 		.get_shortroomid(&room_id)
 		.await

src/api/client/room/event.rs

@@ -16,13 +16,11 @@ pub(crate) async fn get_room_event_route(
 	let room_id = &body.room_id;
 
 	let event = services
-		.rooms
 		.timeline
 		.get_pdu(event_id)
 		.map_err(|_| err!(Request(NotFound("Event {} not found.", event_id))));
 
 	let visible = services
-		.rooms
 		.state_accessor
 		.user_can_see_event(body.sender_user(), room_id, event_id)
 		.map(Ok);

src/api/client/room/initial_sync.rs

@@ -17,7 +17,6 @@ pub(crate) async fn room_initial_sync_route(
 	let room_id = &body.room_id;
 
 	if !services
-		.rooms
 		.state_accessor
 		.user_can_see_state_events(body.sender_user(), room_id)
 		.await
@@ -26,19 +25,13 @@ pub(crate) async fn room_initial_sync_route(
 	}
 
 	let membership = services
-		.rooms
 		.state_cache
 		.user_membership(body.sender_user(), room_id)
 		.map(Ok);
 
-	let visibility = services
-		.rooms
-		.directory
-		.visibility(room_id)
-		.map(Ok);
+	let visibility = services.directory.visibility(room_id).map(Ok);
 
 	let state = services
-		.rooms
 		.state_accessor
 		.room_state_full_pdus(room_id)
 		.map_ok(Event::into_format)
@@ -46,7 +39,6 @@ pub(crate) async fn room_initial_sync_route(
 
 	let limit = LIMIT_MAX;
 	let events = services
-		.rooms
 		.timeline
 		.pdus_rev(None, room_id, None)
 		.try_take(limit)

src/api/client/room/summary.rs

@@ -54,12 +54,11 @@ pub(crate) async fn get_room_summary(
 	body: Ruma<get_summary::v1::Request>,
 ) -> Result<get_summary::v1::Response> {
 	let (room_id, servers) = services
-		.rooms
 		.alias
 		.resolve_with_servers(&body.room_id_or_alias, Some(body.via.clone()))
 		.await?;
 
-	if services.rooms.metadata.is_banned(&room_id).await {
+	if services.metadata.is_banned(&room_id).await {
 		return Err!(Request(Forbidden("This room is banned on this homeserver.")));
 	}
 
@@ -75,7 +74,6 @@ async fn room_summary_response(
 	sender_user: Option<&UserId>,
 ) -> Result<get_summary::v1::Response> {
 	if services
-		.rooms
 		.state_cache
 		.server_in_room(services.globals.server_name(), room_id)
 		.await
@@ -103,20 +101,11 @@ async fn local_room_summary_response(
 	sender_user: Option<&UserId>,
 ) -> Result<get_summary::v1::Response> {
 	trace!(?sender_user, "Sending local room summary response for {room_id:?}");
-	let join_rule = services
-		.rooms
-		.state_accessor
-		.get_join_rules(room_id);
+	let join_rule = services.state_accessor.get_join_rules(room_id);
 
-	let world_readable = services
-		.rooms
-		.state_accessor
-		.is_world_readable(room_id);
+	let world_readable = services.state_accessor.is_world_readable(room_id);
 
-	let guest_can_join = services
-		.rooms
-		.state_accessor
-		.guest_can_join(room_id);
+	let guest_can_join = services.state_accessor.guest_can_join(room_id);
 
 	let (join_rule, world_readable, guest_can_join) =
 		join3(join_rule, world_readable, guest_can_join).await;
@@ -134,49 +123,35 @@ async fn local_room_summary_response(
 	.await?;
 
 	let canonical_alias = services
-		.rooms
 		.state_accessor
 		.get_canonical_alias(room_id)
 		.ok();
 
-	let name = services
-		.rooms
-		.state_accessor
-		.get_name(room_id)
-		.ok();
+	let name = services.state_accessor.get_name(room_id).ok();
 
 	let topic = services
-		.rooms
 		.state_accessor
 		.get_room_topic(room_id)
 		.ok();
 
 	let room_type = services
-		.rooms
 		.state_accessor
 		.get_room_type(room_id)
 		.ok();
 
 	let avatar_url = services
-		.rooms
 		.state_accessor
 		.get_avatar(room_id)
 		.map(|res| res.into_option().unwrap_or_default().url);
 
-	let room_version = services
-		.rooms
-		.state
-		.get_room_version(room_id)
-		.ok();
+	let room_version = services.state.get_room_version(room_id).ok();
 
 	let encryption = services
-		.rooms
 		.state_accessor
 		.get_room_encryption(room_id)
 		.ok();
 
 	let num_joined_members = services
-		.rooms
 		.state_cache
 		.room_joined_count(room_id)
 		.unwrap_or(0);
@@ -184,7 +159,6 @@ async fn local_room_summary_response(
 	let membership: OptionFuture<_> = sender_user
 		.map(|sender_user| {
 			services
-				.rooms
 				.state_accessor
 				.get_member(room_id, sender_user)
 				.map_ok_or(MembershipState::Leave, |content| content.membership)
@@ -244,7 +218,7 @@ async fn remote_room_summary_hierarchy_response(
 		return Err!(Request(Forbidden("Federation is disabled.")));
 	}
 
-	if services.rooms.metadata.is_disabled(room_id).await {
+	if services.metadata.is_disabled(room_id).await {
 		return Err!(Request(Forbidden(
 			"Federaton of room {room_id} is currently disabled on this server."
 		)));
@@ -313,7 +287,6 @@ where
 	match sender_user {
 		| Some(sender_user) => {
 			let user_can_see_state_events = services
-				.rooms
 				.state_accessor
 				.user_can_see_state_events(sender_user, room_id);
 
@@ -322,12 +295,9 @@ where
 				.is_deactivated(sender_user)
 				.unwrap_or(false);
 
-			let user_in_allowed_restricted_room = allowed_room_ids.stream().any(|room| {
-				services
-					.rooms
-					.state_cache
-					.is_joined(sender_user, room)
-			});
+			let user_in_allowed_restricted_room = allowed_room_ids
+				.stream()
+				.any(|room| services.state_cache.is_joined(sender_user, room));
 
 			let (user_can_see_state_events, is_guest, user_in_allowed_restricted_room) =
 				join3(user_can_see_state_events, is_guest, user_in_allowed_restricted_room)

src/api/client/room/upgrade.rs

@@ -81,23 +81,16 @@ pub(crate) async fn upgrade_room_route(
 	let replacement_room = RoomId::new_v1(services.globals.server_name());
 
 	let _short_id = services
-		.rooms
 		.short
 		.get_or_create_shortroomid(&replacement_room)
 		.await;
 
-	let state_lock = services
-		.rooms
-		.state
-		.mutex
-		.lock(&body.room_id)
-		.await;
+	let state_lock = services.state.mutex.lock(&body.room_id).await;
 
 	// Send a m.room.tombstone event to the old room to indicate that it is not
 	// intended to be used any further Fail if the sender does not have the required
 	// permissions
 	let tombstone_event_id = services
-		.rooms
 		.timeline
 		.build_and_append_pdu(
 			PduBuilder::state(StateKey::new(), &RoomTombstoneEventContent {
@@ -112,16 +105,10 @@ pub(crate) async fn upgrade_room_route(
 
 	// Change lock to replacement room
 	drop(state_lock);
-	let state_lock = services
-		.rooms
-		.state
-		.mutex
-		.lock(&replacement_room)
-		.await;
+	let state_lock = services.state.mutex.lock(&replacement_room).await;
 
 	// Get the old room creation event
 	let mut create_event_content: CanonicalJsonObject = services
-		.rooms
 		.state_accessor
 		.room_state_get_content(&body.room_id, &StateEventType::RoomCreate, "")
 		.await
@@ -174,7 +161,6 @@ pub(crate) async fn upgrade_room_route(
 	}
 
 	services
-		.rooms
 		.timeline
 		.build_and_append_pdu(
 			PduBuilder {
@@ -193,7 +179,6 @@ pub(crate) async fn upgrade_room_route(
 
 	// Join the new room
 	services
-		.rooms
 		.timeline
 		.build_and_append_pdu(
 			PduBuilder {
@@ -222,7 +207,6 @@ pub(crate) async fn upgrade_room_route(
 	// Replicate transferable state events to the new room
 	for event_type in TRANSFERABLE_STATE_EVENTS {
 		let event_content = match services
-			.rooms
 			.state_accessor
 			.room_state_get(&body.room_id, event_type, "")
 			.await
@@ -232,7 +216,6 @@ pub(crate) async fn upgrade_room_route(
 		};
 
 		services
-			.rooms
 			.timeline
 			.build_and_append_pdu(
 				PduBuilder {
@@ -250,27 +233,23 @@ pub(crate) async fn upgrade_room_route(
 
 	// Moves any local aliases to the new room
 	let mut local_aliases = services
-		.rooms
 		.alias
 		.local_aliases_for_room(&body.room_id)
 		.boxed();
 
 	while let Some(alias) = local_aliases.next().await {
 		services
-			.rooms
 			.alias
 			.remove_alias(alias, sender_user)
 			.await?;
 
 		services
-			.rooms
 			.alias
 			.set_alias(alias, &replacement_room, sender_user)?;
 	}
 
 	// Get the old room power levels
 	let power_levels_event_content: RoomPowerLevelsEventContent = services
-		.rooms
 		.state_accessor
 		.room_state_get_content(&body.room_id, &StateEventType::RoomPowerLevels, "")
 		.await
@@ -290,7 +269,6 @@ pub(crate) async fn upgrade_room_route(
 	// Modify the power levels in the old room to prevent sending of events and
 	// inviting new users
 	services
-		.rooms
 		.timeline
 		.build_and_append_pdu(
 			PduBuilder::state(StateKey::new(), &RoomPowerLevelsEventContent {