Lazily load audio instead of prefetching it

Author: GnomedDev

Cargo.lock

@@ -2,7 +2,7 @@
 name = "tts_bot"
 version = "0.1.0"
 edition = "2024"
-rust-version = "1.93"
+rust-version = "1.94"
 
 [workspace]
 members = [
@@ -18,8 +18,9 @@ lto = "thin"
 panic = "abort"
 debug = 2
 
-[profile.dev.package.syn]
-opt-level = 3
+[profile.dev]
+panic = "abort"
+package = { syn = { opt-level = 3 } }
 
 [lints]
 workspace = true

Cargo.toml

@@ -31,7 +31,7 @@
             outputHashes = {
               "audiopus_sys-0.2.2" = "sha256-epzB54105Iihrfyj1HZNGSLOaihLw4rUZsT+rw/sXZs=";
               "poise-0.6.1" = "sha256-qCTEkOWCpKgEXCt7apg+tiScE+X0Br0giTNNBxqNCs0=";
-              "serenity-0.12.5" = "sha256-AyXiT2rr+//LeLPxPYaa+TqCuKXN9dpdZf2IjyXrbfU=";
+              "serenity-0.12.5" = "sha256-8I9rGKL/a8jwbLnDYV/jZEi+rDuLAn6Nk/QAJr00Kxo=";
               "serenity-voice-model-0.3.0" = "sha256-ZGwzX+saQ7RY8BtpuxzCC24vc/uQWuRWoi88ZzuJL1o=";
               "songbird-0.5.0" = "sha256-wacSNkIjA1rsENNPbo/KVDfoMXllrr+vA2pmPxsNzEs=";
             };

flake.lock

@@ -2,7 +2,7 @@
 name = "tts_commands"
 version = "0.1.0"
 edition = "2024"
-rust-version = "1.93"
+rust-version = "1.94"
 
 [dependencies]
 indexmap = "2.13.0"

flake.nix

@@ -133,9 +133,7 @@ async fn tts_(ctx: Context<'_>, author: &serenity::User, message: &str) -> Comma
         let auth_key = data.config.tts_service_auth_key.as_deref();
         let audio = fetch_audio(&data.reqwest, url, auth_key)
             .await?
-            .try_unwrap()?
-            .bytes()
-            .await?;
+            .try_unwrap()?;
 
         let mut file_name = author_name;
         file_name.push_str(&aformat!(
@@ -147,7 +145,7 @@ async fn tts_(ctx: Context<'_>, author: &serenity::User, message: &str) -> Comma
             }
         ));
 
-        serenity::CreateAttachment::bytes(audio.to_vec(), file_name)
+        serenity::CreateAttachment::bytes(audio, file_name)
     };
 
     ctx.send(

tts_commands/Cargo.toml

@@ -2,11 +2,12 @@
 name = "tts_core"
 version = "0.1.0"
 edition = "2024"
-rust-version = "1.93"
+rust-version = "1.94"
 
 [dependencies]
 rand = "0.10"
 sha2 = "0.10.9"
+bytes = "1.11.1"
 linkify = "0.10"
 bitflags = "2.11.0"
 strum_macros = "0.28"

tts_commands/src/other.rs

@@ -94,15 +94,15 @@ pub async fn fetch_audio(
     reqwest: &reqwest::Client,
     url: reqwest::Url,
     auth_key: Option<&str>,
-) -> Result<Option<reqwest::Response>> {
+) -> Result<Option<bytes::Bytes>> {
     let resp = reqwest
         .get(url)
         .header(reqwest::header::AUTHORIZATION, auth_key.unwrap_or(""))
         .send()
         .await?;
 
     match resp.error_for_status_ref() {
-        Ok(_) => Ok(Some(resp)),
+        Ok(_) => Ok(Some(resp.bytes().await?)),
         Err(backup_err) => match resp.json::<TTSServiceError>().await {
             Ok(err) => {
                 if err.code.should_ignore() {

tts_core/Cargo.toml

@@ -532,31 +532,46 @@ struct TrackErrorHandler {
     icon_url: String,
 }
 
-#[serenity::async_trait]
-impl songbird::EventHandler for TrackErrorHandler {
-    async fn act(&self, ctx: &songbird::EventContext<'_>) -> Option<songbird::Event> {
-        if let songbird::EventContext::Track([(state, _)]) = ctx
-            && let songbird::tracks::PlayMode::Errored(error) = state.playing.clone()
+impl TrackErrorHandler {
+    async fn log_if_error(&self, ctx: &songbird::EventContext<'_>) {
+        let songbird::EventContext::Track([(state, _)]) = ctx else {
+            return;
+        };
+
+        let songbird::tracks::PlayMode::Errored(error) = state.playing.clone() else {
+            return;
+        };
+
+        if let songbird::error::PlayError::Create(create_error) = &error
+            && let songbird::input::AudioStreamError::Unsupported = **create_error
         {
-            let mut extra_fields_iter = self.extra_fields.iter().cloned();
-            let author_name = Some(self.author_name.as_str());
-            let icon_url = Some(self.icon_url.as_str());
-
-            let result = handle_unexpected(
-                &self.ctx,
-                "TrackError",
-                error.into(),
-                extra_fields_iter.by_ref(),
-                author_name,
-                icon_url,
-            )
-            .await;
+            return;
+        }
 
-            if let Err(err_err) = result {
-                tracing::error!("Songbird unhandled track error: {err_err}");
-            }
+        let mut extra_fields_iter = self.extra_fields.iter().cloned();
+        let author_name = Some(self.author_name.as_str());
+        let icon_url = Some(self.icon_url.as_str());
+
+        let result = handle_unexpected(
+            &self.ctx,
+            "TrackError",
+            error.into(),
+            extra_fields_iter.by_ref(),
+            author_name,
+            icon_url,
+        )
+        .await;
+
+        if let Err(err_err) = result {
+            tracing::error!("Songbird unhandled track error: {err_err}");
         }
+    }
+}
 
+#[serenity::async_trait]
+impl songbird::EventHandler for TrackErrorHandler {
+    async fn act(&self, ctx: &songbird::EventContext<'_>) -> Option<songbird::Event> {
+        self.log_if_error(ctx).await;
         Some(songbird::Event::Cancel)
     }
 }

tts_core/src/common.rs

@@ -59,7 +59,7 @@ pub struct Config {
 
 #[derive(serde::Deserialize)]
 pub struct MainConfig {
-    pub tts_service_auth_key: Option<FixedString>,
+    pub tts_service_auth_key: Option<Arc<str>>,
     pub website_url: Option<reqwest::Url>,
     pub announcements_channel: ChannelId,
     pub main_server_invite: FixedString,