ci: Mirror to Docker Hub

.forgejo/actions/setup-rust/action.yml

@@ -19,7 +19,7 @@ inputs:
   rust-version:
     description: 'Rust version to install (e.g. nightly). Defaults to 1.87.0'
     required: false
-    default: ''
+    default: '1.87.0'
   sccache-cache-limit:
     description: 'Maximum size limit for sccache local cache (e.g. 2G, 500M)'
     required: false

.forgejo/workflows/update-flake-hashes.yml

@@ -20,8 +20,7 @@ jobs:
           fetch-tags: false
           fetch-single-branch: true
           submodules: false
-          persist-credentials: true
-          token: ${{ secrets.FORGEJO_TOKEN }}
+          persist-credentials: false
 
       - uses: https://github.com/cachix/install-nix-action@7ab6e7fd29da88e74b1e314a4ae9ac6b5cda3801 # v31.8.0
         with:

Cargo.lock

@@ -4901,9 +4901,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 
 [[package]]
 name = "syn"
-version = "2.0.110"
+version = "2.0.109"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a99801b5bd34ede4cf3fc688c5919368fea4e4814a4664359503e6015b280aea"
+checksum = "2f17c7e013e88258aa9543dcbe81aca68a667a9ac37cd69c9fbc07858bfe0e2f"
 dependencies = [
  "proc-macro2",
  "quote",

docker/Dockerfile

@@ -48,7 +48,7 @@ EOF
 
 # Developer tool versions
 # renovate: datasource=github-releases depName=cargo-bins/cargo-binstall
-ENV BINSTALL_VERSION=1.15.11
+ENV BINSTALL_VERSION=1.15.10
 # renovate: datasource=github-releases depName=psastras/sbom-rs
 ENV CARGO_SBOM_VERSION=0.9.1
 # renovate: datasource=crate depName=lddtree

docker/musl.Dockerfile

@@ -18,7 +18,7 @@ RUN --mount=type=cache,target=/etc/apk/cache apk add \
 
 # Developer tool versions
 # renovate: datasource=github-releases depName=cargo-bins/cargo-binstall
-ENV BINSTALL_VERSION=1.15.11
+ENV BINSTALL_VERSION=1.15.10
 # renovate: datasource=github-releases depName=psastras/sbom-rs
 ENV CARGO_SBOM_VERSION=0.9.1
 # renovate: datasource=crate depName=lddtree

nix/packages/rust.nix

@@ -15,7 +15,7 @@
             file = inputs.self + "/rust-toolchain.toml";
 
             # See also `rust-toolchain.toml`
-            sha256 = "sha256-SJwZ8g0zF2WrKDVmHrVG3pD2RGoQeo24MEXnNx5FyuI=";
+            sha256 = "sha256-+9FmLhAOezBZCOziO0Qct1NOrfpjNsXxc/8I0c7BdKE=";
           };
         in
         {

rust-toolchain.toml

@@ -10,7 +10,7 @@
 
 [toolchain]
 profile = "minimal"
-channel = "1.90.0"
+channel = "1.89.0"
 components = [
     # For rust-analyzer
     "rust-src",

src/api/server/send.rs

@@ -5,7 +5,7 @@ use axum_client_ip::InsecureClientIp;
 use conduwuit::{
 	Err, Error, Result, debug,
 	debug::INFO_SPAN_LEVEL,
-	debug_warn, err, error, info,
+	debug_warn, err, error,
 	result::LogErr,
 	trace,
 	utils::{
@@ -79,11 +79,13 @@ pub(crate) async fn send_transaction_message_route(
 	}
 
 	let txn_start_time = Instant::now();
-	info!(
+	trace!(
 		pdus = body.pdus.len(),
 		edus = body.edus.len(),
+		elapsed = ?txn_start_time.elapsed(),
 		id = ?body.transaction_id,
-		"Processing transaction",
+		origin =?body.origin(),
+		"Starting txn",
 	);
 
 	let pdus = body
@@ -102,21 +104,14 @@ pub(crate) async fn send_transaction_message_route(
 		.filter_map(Result::ok)
 		.stream();
 
-	info!(
-		pdus = body.pdus.len(),
-		edus = body.edus.len(),
-		elapsed = ?txn_start_time.elapsed(),
-		id = ?body.transaction_id,
-		"Validated transaction",
-	);
-
 	let results = handle(&services, &client, body.origin(), txn_start_time, pdus, edus).await?;
 
-	info!(
+	debug!(
 		pdus = body.pdus.len(),
 		edus = body.edus.len(),
 		elapsed = ?txn_start_time.elapsed(),
 		id = ?body.transaction_id,
+		origin =?body.origin(),
 		"Finished txn",
 	);
 	for (id, result) in &results {
@@ -143,10 +138,6 @@ async fn handle(
 	pdus: impl Stream<Item = Pdu> + Send,
 	edus: impl Stream<Item = Edu> + Send,
 ) -> Result<ResolvedMap> {
-	edus.for_each_concurrent(automatic_width(), |edu| handle_edu(services, client, origin, edu))
-		.boxed()
-		.await;
-
 	// group pdus by room
 	let pdus = pdus
 		.collect()
@@ -163,8 +154,7 @@ async fn handle(
 		.into_iter()
 		.try_stream()
 		.broad_and_then(|(room_id, pdus): (_, Vec<_>)| {
-			let count = pdus.len();
-			handle_room(services, client, origin, started, room_id, pdus.into_iter(), count)
+			handle_room(services, client, origin, started, room_id, pdus.into_iter())
 				.map_ok(Vec::into_iter)
 				.map_ok(IterStream::try_stream)
 		})
@@ -173,6 +163,11 @@ async fn handle(
 		.boxed()
 		.await?;
 
+	// evaluate edus after pdus, at least for now.
+	edus.for_each_concurrent(automatic_width(), |edu| handle_edu(services, client, origin, edu))
+		.boxed()
+		.await;
+
 	Ok(results)
 }
 
@@ -183,7 +178,6 @@ async fn handle_room(
 	txn_start_time: Instant,
 	room_id: OwnedRoomId,
 	pdus: impl Iterator<Item = Pdu> + Send,
-	count: usize,
 ) -> Result<Vec<(OwnedEventId, Result)>> {
 	let _room_lock = services
 		.rooms
@@ -193,20 +187,10 @@ async fn handle_room(
 		.await;
 
 	let room_id = &room_id;
-	let mut n = 0;
 	pdus.try_stream()
 		.and_then(|(_, event_id, value)| async move {
 			services.server.check_running()?;
 			let pdu_start_time = Instant::now();
-			info!(
-				%room_id,
-				%event_id,
-				pdu = n + 1,
-				total = count,
-				pdu_elapsed = ?pdu_start_time.elapsed(),
-				txn_elapsed = ?txn_start_time.elapsed(),
-				"Handling PDU",
-			);
 			let result = services
 				.rooms
 				.event_handler
@@ -214,16 +198,11 @@ async fn handle_room(
 				.await
 				.map(|_| ());
 
-			info!(
-				%room_id,
-				%event_id,
-				pdu = n + 1,
-				total = count,
+			debug!(
 				pdu_elapsed = ?pdu_start_time.elapsed(),
 				txn_elapsed = ?txn_start_time.elapsed(),
-				"Finished handling PDU {event_id}",
+				"Finished PDU {event_id}",
 			);
-			n += 1;
 
 			Ok((event_id, result))
 		})

src/service/federation/execute.rs

@@ -1,13 +1,9 @@
-use std::{
-	error::Error as _,
-	fmt::{Debug, Write},
-	mem,
-};
+use std::{fmt::Debug, mem};
 
 use bytes::Bytes;
 use conduwuit::{
 	Err, Error, Result, debug, debug::INFO_SPAN_LEVEL, debug_error, debug_warn, err,
-	error::inspect_debug_log, implement, trace, utils::string::EMPTY, warn,
+	error::inspect_debug_log, implement, trace, utils::string::EMPTY,
 };
 use http::{HeaderValue, header::AUTHORIZATION};
 use ipaddress::IPAddress;
@@ -197,9 +193,9 @@ fn handle_error(
 ) -> Result {
 	if e.is_timeout() || e.is_connect() {
 		e = e.without_url();
-		warn!(?url, "network error while sending federation request: {e:?}");
+		debug_warn!("{e:?}");
 	} else if e.is_redirect() {
-		warn!(
+		debug_error!(
 			method = ?method,
 			url = ?url,
 			final_url = ?e.url(),
@@ -208,17 +204,9 @@ fn handle_error(
 			e,
 		);
 	} else {
-		warn!(?url, "failed to send federation request: {e:?}");
+		debug_error!("{e:?}");
 	}
 
-	let mut nice_error = "Request failed".to_owned();
-	let mut src = e.source();
-	while let Some(source) = src {
-		write!(nice_error, ": {source:?}").expect("writing to string should not fail");
-		src = source.source();
-	}
-	warn!(nice_error, "Federation request error");
-
 	Err(e.into())
 }
 

src/service/sending/sender.rs

@@ -10,7 +10,7 @@ use std::{
 
 use base64::{Engine as _, engine::general_purpose::URL_SAFE_NO_PAD};
 use conduwuit_core::{
-	Error, Event, Result, debug, err, error, info,
+	Error, Event, Result, debug, err, error,
 	result::LogErr,
 	trace,
 	utils::{
@@ -142,7 +142,7 @@ impl Service {
 	}
 
 	fn handle_response_err(dest: Destination, statuses: &mut CurTransactionStatus, e: &Error) {
-		debug!(dest = ?dest, "error response: {e:?}");
+		debug!(dest = ?dest, "{e:?}");
 		statuses.entry(dest).and_modify(|e| {
 			*e = match e {
 				| TransactionStatus::Running => TransactionStatus::Failed(1, Instant::now()),
@@ -177,21 +177,7 @@ impl Service {
 		if !new_events.is_empty() {
 			self.db.mark_as_active(new_events.iter());
 
-			let new_events_vec: Vec<SendingEvent> =
-				new_events.into_iter().map(|(_, event)| event).collect();
-
-			if let Some(status) = statuses.get(&dest.clone()) {
-				if matches!(status, TransactionStatus::Running) {
-					// If the server is in backoff, clear it
-					info!(
-						?dest,
-						"Catching up previously failed destination with {}+ new events",
-						new_events_vec.len()
-					);
-					statuses.insert(dest.clone(), TransactionStatus::Running);
-				}
-			}
-
+			let new_events_vec = new_events.into_iter().map(|(_, event)| event).collect();
 			futures.push(self.send_events(dest.clone(), new_events_vec));
 		} else {
 			statuses.remove(dest);
@@ -873,20 +859,12 @@ impl Service {
 			pdus,
 			edus,
 		};
-		let pdu_count = request.pdus.len();
-		let edu_count = request.edus.len();
 
 		let result = self
 			.services
 			.federation
 			.execute_on(&self.services.client.sender, &server, request)
-			.await
-			.inspect(|_| {
-				info!(%txn_id, %server, "Sent {} PDUs, {} EDUs", pdu_count, edu_count);
-			})
-			.inspect_err(|e| {
-				info!(%txn_id, %server, "Failed to send transaction ({} PDUs, {} EDUs): {e:?}", pdu_count, edu_count);
-			});
+			.await;
 
 		for (event_id, result) in result.iter().flat_map(|resp| resp.pdus.iter()) {
 			if let Err(e) = result {