Cargo.lock

@@ -233,6 +233,7 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 name = "audrey"
 version = "0.1.0"
 dependencies = [
+ "async-channel",
  "bindgen",
  "bytes",
  "chrono",

Cargo.toml

@@ -5,6 +5,7 @@ edition = "2021"
 
 [dependencies]
 adw = { version = "0.7.0", package = "libadwaita", features = ["v1_6"] }
+async-channel = "2.3.1"
 bytes = "1.8.0"
 chrono = { version = "0.4.38", features = ["serde", "std"], default-features = false }
 color-thief = "0.2.2"

src/subsonic.rs

@@ -153,7 +153,8 @@ impl Client {
         &self,
         request: reqwest_middleware::RequestBuilder,
     ) -> Result<ByteResponse, Error> {
-        let (sender, receiver) = tokio::sync::oneshot::channel();
+        // FIXME: is an entire channel per request overkill? maybe pool them?
+        let (sender, receiver) = async_channel::bounded(1);
 
         // let tokio take care of the request + further json parsing
         // this is because reqwest doesn't like the glib main loop
@@ -197,10 +198,11 @@ impl Client {
             // note that in general its fine not to cancel the tokio task when its corresponding
             // mainloop task is dropped, since eg for song thumbnails there's already a semaphore
             // limiting concurrent requests
-            let _ = sender.send(perform(future.await).await);
+            let _ = sender.send(perform(future.await).await).await;
         });
 
         receiver
+            .recv()
             .await
             .map_err(|_| Error::OtherError("failed to receive response from tokio loop"))?
     }