fix: reduce ping timeout in app to 5 sec not 30 sec (#6545)

* fix: reduce ping timeout in app to 5 sec not 30 sec

* feat: readd comment

apps/app-frontend/src/helpers/worlds.ts

@@ -404,28 +404,35 @@ export async function refreshServerData(
 ): Promise<void> {
 	const refreshTime = Date.now()
 	serverData.refreshing = true
-	await get_server_status(address, protocolVersion)
-		.then((status) => {
-			if (serverData.lastSuccessfulRefresh && serverData.lastSuccessfulRefresh > refreshTime) {
-				// Don't update if there was a more recent successful refresh
-				return
-			}
-			serverData.lastSuccessfulRefresh = Date.now()
-			serverData.status = status
-			if (status.description) {
-				serverData.rawMotd = status.description
-				serverData.renderedMotd = autoToHTML(status.description)
-			}
-		})
-		.finally(() => {
-			serverData.refreshing = false
-		})
-		.catch((err) => {
-			console.error(`Refreshing addr ${address}`, protocolVersion, err)
-			if (!protocolVersion?.legacy) {
-				refreshServerData(serverData, { version: 74, legacy: true }, address)
-			}
-		})
+	try {
+		const status = await get_server_status(address, protocolVersion)
+		if (serverData.lastSuccessfulRefresh && serverData.lastSuccessfulRefresh > refreshTime) {
+			// Don't update if there was a more recent successful refresh
+			return
+		}
+		serverData.lastSuccessfulRefresh = Date.now()
+		serverData.status = status
+		if (status.description) {
+			serverData.rawMotd = status.description
+			serverData.renderedMotd = autoToHTML(status.description)
+		} else {
+			delete serverData.rawMotd
+			delete serverData.renderedMotd
+		}
+	} catch (err) {
+		console.error(`Refreshing addr ${address}`, protocolVersion, err)
+		if (!protocolVersion?.legacy) {
+			await refreshServerData(serverData, { version: 74, legacy: true }, address)
+			return
+		}
+		if (!serverData.lastSuccessfulRefresh || serverData.lastSuccessfulRefresh <= refreshTime) {
+			delete serverData.status
+			delete serverData.rawMotd
+			delete serverData.renderedMotd
+		}
+	} finally {
+		serverData.refreshing = false
+	}
 }
 
 export function refreshServers(
@@ -444,7 +451,7 @@ export function refreshServers(
 		}
 	})
 
-	// noinspection ES6MissingAwait - handled with .then by refreshServerData already
+	// noinspection ES6MissingAwait - handled by refreshServerData
 	Object.keys(serverData).forEach((address) =>
 		refreshServerData(serverData[address], protocolVersion, address),
 	)

packages/app-lib/src/util/server_ping.rs

@@ -13,6 +13,7 @@ const MAX_MODERN_STATUS_PACKET_LENGTH: usize =
     MAX_MINECRAFT_STATUS_STRING_LENGTH + 4;
 const MAX_LEGACY_STATUS_UTF16_LENGTH: usize =
     MAX_MINECRAFT_STATUS_STRING_LENGTH;
+const SERVER_STATUS_TIMEOUT: Duration = Duration::from_secs(5);
 
 /// Ensures the length of a packet as stated by a server is not longer than a
 /// hard-coded limit.
@@ -87,7 +88,7 @@ pub async fn get_server_status(
                 protocol => modern::status(address, original_address, protocol.map(|v| v.version)).await,
             }
         } => res,
-        _ = tokio::time::sleep(Duration::from_secs(30)) => Err(ErrorKind::OtherError(
+        _ = tokio::time::sleep(SERVER_STATUS_TIMEOUT) => Err(ErrorKind::OtherError(
             format!("Ping of {}:{} timed out", original_address.0, original_address.1)
         ).into())
     }