Fix a couple JavaScript errors

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,33 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Version information (please complete the following information):**
+ - OS: [e.g. NixOS 23.11]
+ - Browser [e.g. firefox, chrome]
+ - Empede version [e.g. v0.2.1]
+ - MPD version [e.g. 0.23.15]
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

CODE_OF_CONDUCT.md

@@ -0,0 +1,128 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+coc@vijf.life.
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "empede"
 description = "A web client for MPD"
-version = "0.2.1"
+version = "0.2.3"
 edition = "2021"
 license = "MIT"
 repository = "https://github.com/vijfhoek/empede"
@@ -9,13 +9,17 @@ repository = "https://github.com/vijfhoek/empede"
 [dependencies]
 anyhow = "1.0.70"
 askama = { version = "0.12.0", default-features = false, features = ["serde-json"] }
-askama_tide = "0.15.0"
-async-std = { version = "1.12.0", features = ["attributes"] }
 infer = { version = "0.15.0", default-features = false }
 percent-encoding = "2.2.0"
 serde = { version = "1.0.160", features = ["derive"] }
 serde_qs = "0.12.0"
-tide = "0.16.0"
+askama_actix = "0.14.0"
-tide-tracing = "0.0.12"
+tokio = { version = "1.35.1", features = ["full"] }
-tracing = { version = "0.1.37", default-features = false, features = ["std"] }
+actix-web = "4.4.0"
-tracing-subscriber = { version = "0.3.17", default-features = false, features = ["std", "fmt"] }
+thiserror = "1.0.51"
+actix-files = "0.6.2"
+actix-web-lab = "0.20.1"
+tokio-stream = "0.1.14"
+futures = "0.3.29"
+async-stream = "0.3.5"
+env_logger = "0.10.1"

Dockerfile

@@ -1,9 +1,9 @@
-FROM rust:alpine as builder
+FROM rust:alpine AS builder
 WORKDIR /usr/src/empede
 RUN apk add --no-cache build-base
 COPY ./src ./src
 COPY ./templates ./templates
-COPY ./Cargo.* ./
+COPY ./Cargo.toml ./Cargo.lock ./
 RUN cargo install --path .
 
 FROM alpine:latest

src/main.rs

@@ -1,61 +1,43 @@
+use actix_web::{middleware::Logger, web, App, HttpServer};
+
 mod crate_version;
 mod mpd;
 mod routes;
 
-async fn sse(_req: tide::Request<()>, sender: tide::sse::Sender) -> tide::Result<()> {
+#[actix_web::main]
-    // Update everything on connect
+async fn main() -> std::io::Result<()> {
-    sender.send("playlist", "", None).await?;
+    let bind = std::env::var("EMPEDE_BIND").unwrap_or("0.0.0.0:8080".into());
-    sender.send("player", "", None).await?;
+    let (host, port) = bind.split_once(':').unwrap();
 
-    let mut mpd = mpd::Mpd::new();
+    env_logger::init_from_env(env_logger::Env::new().default_filter_or("info"));
-    mpd.connect().await.unwrap();
 
-    loop {
+    HttpServer::new(|| {
-        let systems = mpd
+        App::new().wrap(Logger::default()).service(
-            .idle(&["playlist", "player", "database", "options"])
+            web::scope("")
-            .await?;
+                .service(routes::index::get_index)
-        for system in systems {
+                .service(routes::player::get_player)
-            sender.send(&system, "", None).await?;
+                .service(routes::browser::get_browser)
-        }
+                .service(routes::art::get_art)
-    }
+                .service(routes::sse::idle)
-}
+                .service(routes::queue::get_queue)
-
+                .service(routes::queue::post_queue)
-#[async_std::main]
+                .service(routes::queue::delete_queue)
-async fn main() -> tide::Result<()> {
+                .service(routes::queue::post_queue_move)
-    tracing_subscriber::fmt()
+                .service(routes::controls::post_play)
-        .with_max_level(tracing::Level::WARN)
+                .service(routes::controls::post_pause)
-        .init();
+                .service(routes::controls::post_previous)
-
+                .service(routes::controls::post_next)
-    let mut app = tide::new();
+                .service(routes::controls::post_consume)
-    app.with(tide_tracing::TraceMiddleware::new());
+                .service(routes::controls::post_random)
-
+                .service(routes::controls::post_repeat)
-    app.at("/").get(routes::index::get_index);
+                .service(routes::controls::post_single)
-    app.at("/player").get(routes::player::get_player);
+                .service(routes::controls::post_shuffle)
-    app.at("/browser").get(routes::browser::get_browser);
+                .service(actix_files::Files::new("/static", "./static")),
-    app.at("/art").get(routes::art::get_art);
+        )
-
+    })
-    app.at("/sse").get(tide::sse::endpoint(sse));
+    .bind((host, port.parse().unwrap()))?
-
+    .run()
-    app.at("/queue").get(routes::queue::get_queue);
+    .await?;
-    app.at("/queue").post(routes::queue::post_queue);
-    app.at("/queue").delete(routes::queue::delete_queue);
-    app.at("/queue/move").post(routes::queue::post_queue_move);
-
-    app.at("/play").post(routes::controls::post_play);
-    app.at("/pause").post(routes::controls::post_pause);
-    app.at("/previous").post(routes::controls::post_previous);
-    app.at("/next").post(routes::controls::post_next);
-
-    app.at("/consume").post(routes::controls::post_consume);
-    app.at("/random").post(routes::controls::post_random);
-    app.at("/repeat").post(routes::controls::post_repeat);
-    app.at("/single").post(routes::controls::post_single);
-    app.at("/shuffle").post(routes::controls::post_shuffle);
-
-    app.at("/static").serve_dir("static/")?;
-
-    let bind = std::env::var("EMPEDE_BIND").unwrap_or("0.0.0.0:8080".to_string());
-    app.listen(bind).await?;
 
     Ok(())
 }

src/mpd.rs

@@ -1,11 +1,10 @@
-use std::{collections::HashMap, sync::OnceLock};
+use std::collections::HashMap;
 
 use anyhow::anyhow;
-use async_std::{
+use tokio::{
-    io::{prelude::BufReadExt, BufReader, ReadExt, WriteExt},
+    io::{AsyncBufReadExt, AsyncReadExt, AsyncWriteExt, BufStream},
     net::TcpStream,
-    sync::{Mutex, MutexGuard},
+    sync::{Mutex, MutexGuard, OnceCell},
-    task::block_on,
 };
 
 pub fn host() -> String {
@@ -16,6 +15,7 @@ pub fn host() -> String {
 
 pub struct QueueItem {
     pub id: u32,
+    pub position: i32,
     pub file: String,
     pub title: String,
     pub artist: Option<String>,
@@ -42,19 +42,21 @@ pub enum Entry {
 
 #[derive(Debug)]
 pub struct Mpd {
-    stream: Option<TcpStream>,
+    bufstream: Option<BufStream<TcpStream>>,
-    reader: Option<BufReader<TcpStream>>,
 }
 
-pub static INSTANCE: OnceLock<Mutex<Mpd>> = OnceLock::new();
+pub static INSTANCE: OnceCell<Mutex<Mpd>> = OnceCell::const_new();
 
 pub async fn get_instance() -> MutexGuard<'static, Mpd> {
-    let instance = INSTANCE.get_or_init(|| {
+    INSTANCE
-        let mut mpd = Mpd::new();
+        .get_or_init(|| async {
-        block_on(mpd.connect()).unwrap();
+            let mut mpd = Mpd::new();
-        Mutex::from(mpd)
+            mpd.connect().await.unwrap();
-    });
+            Mutex::from(mpd)
-    instance.lock().await
+        })
+        .await
+        .lock()
+        .await
 }
 
 pub async fn command(command: &str) -> anyhow::Result<CommandResult> {
@@ -116,45 +118,42 @@ impl Mpd {
     }
 
     pub fn new() -> Self {
-        Self {
+        Self { bufstream: None }
-            stream: None,
-            reader: None,
-        }
     }
 
     pub async fn connect(&mut self) -> anyhow::Result<()> {
-        self.stream = Some(TcpStream::connect(host()).await?);
+        let stream = TcpStream::connect(host()).await?;
-        self.reader = Some(BufReader::new(self.stream.as_mut().unwrap().clone()));
+        let mut bufstream = BufStream::new(stream);
 
         // skip OK MPD line
         // TODO check if it is indeed OK
         let mut buffer = String::new();
-        self.reader.as_mut().unwrap().read_line(&mut buffer).await?;
+        bufstream.read_line(&mut buffer).await?;
 
         let password = std::env::var("MPD_PASSWORD").unwrap_or_default();
         if !password.is_empty() {
             let password = Self::escape_str(&password);
-            self.stream
+            bufstream
-                .as_mut()
+                .write_all(format!("password \"{password}\"\n").as_bytes())
-                .unwrap()
-                .write_all(format!(r#"password "{password}"\n"#).as_bytes())
                 .await?;
-            self.reader.as_mut().unwrap().read_line(&mut buffer).await?;
+            bufstream.flush().await?;
+            bufstream.read_line(&mut buffer).await?;
         }
 
-        self.stream
+        bufstream
-            .as_mut()
-            .unwrap()
             .write_all("binarylimit 1048576\n".as_bytes())
             .await?;
-        self.reader.as_mut().unwrap().read_line(&mut buffer).await?;
+        bufstream.flush().await?;
+        bufstream.read_line(&mut buffer).await?;
+
+        self.bufstream = Some(bufstream);
 
         Ok(())
     }
 
     async fn read_binary_data(&mut self, size: usize) -> anyhow::Result<Vec<u8>> {
         let mut binary = vec![0u8; size];
-        self.reader
+        self.bufstream
             .as_mut()
             .unwrap()
             .read_exact(&mut binary)
@@ -163,11 +162,19 @@ impl Mpd {
         let mut buffer = String::new();
 
         // Skip the newline after the binary data
-        self.reader.as_mut().unwrap().read_line(&mut buffer).await?;
+        self.bufstream
+            .as_mut()
+            .unwrap()
+            .read_line(&mut buffer)
+            .await?;
 
         // Skip the "OK" after the binary data
         // TODO Check if actually OK
-        self.reader.as_mut().unwrap().read_line(&mut buffer).await?;
+        self.bufstream
+            .as_mut()
+            .unwrap()
+            .read_line(&mut buffer)
+            .await?;
 
         Ok(binary)
     }
@@ -176,16 +183,21 @@ impl Mpd {
         let mut properties = Vec::new();
 
         'retry: loop {
-            self.stream
+            self.bufstream
                 .as_mut()
                 .unwrap()
                 .write_all(format!("{command}\n").as_bytes())
                 .await?;
+            self.bufstream.as_mut().unwrap().flush().await?;
 
             let mut buffer = String::new();
             break 'retry (loop {
                 buffer.clear();
-                self.reader.as_mut().unwrap().read_line(&mut buffer).await?;
+                self.bufstream
+                    .as_mut()
+                    .unwrap()
+                    .read_line(&mut buffer)
+                    .await?;
 
                 if let Some((key, value)) = buffer.split_once(": ") {
                     let value = value.trim_end();
@@ -238,15 +250,20 @@ impl Mpd {
         Ok(())
     }
 
-    pub async fn add_pos(&mut self, path: &str, pos: &str) -> anyhow::Result<()> {
+    pub async fn add_position(&mut self, path: &str, position: &str) -> anyhow::Result<()> {
         let path = Self::escape_str(path);
-        let pos = Self::escape_str(pos);
+        let position = Self::escape_str(position);
-        self.command(&format!(r#"add "{path}" "{pos}""#)).await?;
+        self.command(&format!(r#"add "{path}" "{position}""#))
+            .await?;
         Ok(())
     }
 
-    pub async fn play(&mut self) -> anyhow::Result<()> {
+    pub async fn play(&mut self, position: Option<&str>) -> anyhow::Result<()> {
-        self.command("play").await?;
+        let command = match position {
+            Some(position) => format!(r#"play "{position}""#),
+            None => "play".into(),
+        };
+        self.command(&command).await?;
         Ok(())
     }
 
@@ -341,6 +358,7 @@ impl Mpd {
             .iter()
             .map(|song| QueueItem {
                 id: song["Id"].parse().unwrap(),
+                position: song["Pos"].parse().unwrap(),
                 file: song["file"].clone(),
                 title: song.get("Title").unwrap_or(&song["file"]).clone(),
                 artist: song.get("Artist").cloned(),

src/routes/art.rs

@@ -1,4 +1,9 @@
 use crate::mpd;
+use actix_web::{
+    get,
+    http::header::{self, CacheDirective},
+    web, HttpResponse, Responder,
+};
 use percent_encoding::percent_decode_str;
 use serde::Deserialize;
 
@@ -8,33 +13,30 @@ struct ArtQuery {
     path: String,
 }
 
-pub async fn get_art(req: tide::Request<()>) -> tide::Result {
+#[get("/art")]
-    let query: ArtQuery = req.query()?;
+pub async fn get_art(query: web::Query<ArtQuery>) -> impl Responder {
     let path = percent_decode_str(&query.path).decode_utf8_lossy();
-
     let mut mpd = mpd::get_instance().await;
 
-    let resp = if let Ok(art) = mpd.albumart(&path).await {
+    if let Ok(art) = mpd.albumart(&path).await {
         let mime = infer::get(&art)
             .map(|k| k.mime_type())
             .unwrap_or("application/octet-stream");
 
-        tide::Response::builder(tide::StatusCode::Ok)
+        HttpResponse::Ok()
-            .body(art)
             .content_type(mime)
-            .header("cache-control", "max-age=3600")
+            .append_header(header::CacheControl(vec![CacheDirective::MaxAge(3600)]))
+            .body(art)
     } else if let Ok(art) = mpd.readpicture(&path).await {
         let mime = infer::get(&art)
             .map(|k| k.mime_type())
             .unwrap_or("application/octet-stream");
 
-        tide::Response::builder(tide::StatusCode::Ok)
+        HttpResponse::Ok()
-            .body(art)
             .content_type(mime)
-            .header("cache-control", "max-age=3600")
+            .append_header(header::CacheControl(vec![CacheDirective::MaxAge(3600)]))
+            .body(art)
     } else {
-        tide::Response::builder(tide::StatusCode::NotFound)
+        HttpResponse::NotFound().finish()
-    };
+    }
-
-    Ok(resp.into())
 }

src/routes/browser.rs

@@ -1,4 +1,5 @@
 use crate::mpd;
+use actix_web::{get, web, Responder};
 use askama::Template;
 use percent_encoding::percent_decode_str;
 use serde::Deserialize;
@@ -17,19 +18,17 @@ struct BrowserQuery {
     path: String,
 }
 
-pub async fn get_browser(req: tide::Request<()>) -> tide::Result {
+#[get("/browser")]
-    let query: BrowserQuery = req.query()?;
+pub async fn get_browser(query: web::Query<BrowserQuery>) -> impl Responder {
     let path = percent_decode_str(&query.path).decode_utf8_lossy();
     let mut mpd = mpd::get_instance().await;
-    let entries = mpd.ls(&path).await?;
+    let entries = mpd.ls(&path).await.unwrap();
 
-    let template = BrowserTemplate {
+    BrowserTemplate {
         path: Path::new(&*path)
             .iter()
             .map(|s| s.to_string_lossy().to_string())
             .collect(),
         entries,
-    };
+    }
-
-    Ok(template.into())
 }

src/routes/controls.rs

@@ -1,3 +1,6 @@
+use actix_web::{post, web, HttpResponse, Responder};
+use serde::Deserialize;
+
 use crate::mpd;
 
 async fn toggle_setting(setting: &str) -> anyhow::Result<()> {
@@ -11,47 +14,63 @@ async fn toggle_setting(setting: &str) -> anyhow::Result<()> {
     Ok(())
 }
 
-pub async fn post_play(_req: tide::Request<()>) -> tide::Result {
+#[derive(Deserialize)]
-    mpd::command("play").await?;
+struct PostPlayQuery {
-    Ok("".into())
+    #[serde(default)]
+    position: Option<String>,
 }
 
-pub async fn post_pause(_req: tide::Request<()>) -> tide::Result {
+#[post("/play")]
-    mpd::command("pause 1").await?;
+pub async fn post_play(query: web::Query<PostPlayQuery>) -> impl Responder {
-    Ok("".into())
+    let mut mpd = mpd::get_instance().await;
+    mpd.play(query.position.as_deref()).await.unwrap();
+    HttpResponse::NoContent()
 }
 
-pub async fn post_previous(_req: tide::Request<()>) -> tide::Result {
+#[post("/pause")]
-    mpd::command("previous").await?;
+pub async fn post_pause() -> impl Responder {
-    Ok("".into())
+    mpd::command("pause 1").await.unwrap();
+    HttpResponse::NoContent()
 }
 
-pub async fn post_next(_req: tide::Request<()>) -> tide::Result {
+#[post("/previous")]
-    mpd::command("next").await?;
+pub async fn post_previous() -> impl Responder {
-    Ok("".into())
+    mpd::command("previous").await.unwrap();
+    HttpResponse::NoContent()
 }
 
-pub async fn post_consume(_req: tide::Request<()>) -> tide::Result {
+#[post("/next")]
-    toggle_setting("consume").await?;
+pub async fn post_next() -> impl Responder {
-    Ok("".into())
+    mpd::command("next").await.unwrap();
+    HttpResponse::NoContent()
 }
 
-pub async fn post_random(_req: tide::Request<()>) -> tide::Result {
+#[post("/consume")]
-    toggle_setting("random").await?;
+pub async fn post_consume() -> impl Responder {
-    Ok("".into())
+    toggle_setting("consume").await.unwrap();
+    HttpResponse::NoContent()
 }
 
-pub async fn post_repeat(_req: tide::Request<()>) -> tide::Result {
+#[post("/random")]
-    toggle_setting("repeat").await?;
+pub async fn post_random() -> impl Responder {
-    Ok("".into())
+    toggle_setting("random").await.unwrap();
+    HttpResponse::NoContent()
 }
 
-pub async fn post_shuffle(_req: tide::Request<()>) -> tide::Result {
+#[post("/repeat")]
-    mpd::command("shuffle").await?;
+pub async fn post_repeat() -> impl Responder {
-    Ok("".into())
+    toggle_setting("repeat").await.unwrap();
+    HttpResponse::NoContent()
 }
 
-pub async fn post_single(_req: tide::Request<()>) -> tide::Result {
+#[post("/shuffle")]
-    toggle_setting("single").await?;
+pub async fn post_shuffle() -> impl Responder {
-    Ok("".into())
+    mpd::command("shuffle").await.unwrap();
-}
+    HttpResponse::NoContent()
+}
+
+#[post("/single")]
+pub async fn post_single() -> impl Responder {
+    toggle_setting("single").await.unwrap();
+    HttpResponse::NoContent()
+}

src/routes/index.rs

@@ -1,4 +1,5 @@
 use crate::crate_version;
+use actix_web::{get, Responder};
 use askama::Template;
 use serde::Deserialize;
 
@@ -12,6 +13,7 @@ struct IndexQuery {
     path: String,
 }
 
-pub async fn get_index(_req: tide::Request<()>) -> tide::Result {
+#[get("/")]
-    Ok(askama_tide::into_response(&IndexTemplate))
+pub async fn get_index() -> impl Responder {
+    IndexTemplate
 }

src/routes/mod.rs

@@ -1,6 +1,7 @@
 pub mod art;
 pub mod browser;
+pub mod controls;
 pub mod index;
 pub mod player;
 pub mod queue;
-pub mod controls;
+pub mod sse;

src/routes/player.rs

@@ -1,13 +1,14 @@
 use crate::mpd;
+use actix_web::{get, Responder};
 use askama::Template;
 use std::collections::HashMap;
 
 #[derive(Template)]
 #[template(path = "player.html")]
-struct PlayerTemplate<'a> {
+struct PlayerTemplate {
-    song: Option<&'a HashMap<String, String>>,
+    song: Option<HashMap<String, String>>,
     name: Option<String>,
-    state: &'a str,
+    state: String,
     consume: bool,
     random: bool,
     repeat: bool,
@@ -16,10 +17,11 @@ struct PlayerTemplate<'a> {
     duration: f32,
 }
 
-pub async fn get_player(_req: tide::Request<()>) -> tide::Result {
+#[get("/player")]
+pub async fn get_player() -> impl Responder {
     let mut mpd = mpd::get_instance().await;
-    let song = mpd.command("currentsong").await?.into_hashmap();
+    let song = mpd.command("currentsong").await.unwrap().into_hashmap();
-    let status = mpd.command("status").await?.into_hashmap();
+    let status = mpd.command("status").await.unwrap().into_hashmap();
 
     let elapsed = status
         .get("elapsed")
@@ -31,9 +33,13 @@ pub async fn get_player(_req: tide::Request<()>) -> tide::Result {
         .unwrap_or(1.0);
 
     let mut template = PlayerTemplate {
-        song: if song.is_empty() { None } else { Some(&song) },
+        song: if song.is_empty() {
+            None
+        } else {
+            Some(song.clone())
+        },
         name: None,
-        state: &status["state"],
+        state: status["state"].clone(),
         consume: status["consume"] == "1",
         random: status["random"] == "1",
         repeat: status["repeat"] == "1",
@@ -47,5 +53,5 @@ pub async fn get_player(_req: tide::Request<()>) -> tide::Result {
         template.name = Some(name);
     }
 
-    Ok(template.into())
+    template
 }

src/routes/queue.rs

@@ -1,4 +1,5 @@
 use crate::mpd;
+use actix_web::{delete, get, post, web, HttpResponse, Responder};
 use askama::Template;
 use percent_encoding::percent_decode_str;
 use serde::Deserialize;
@@ -9,11 +10,11 @@ struct QueueTemplate {
     queue: Vec<mpd::QueueItem>,
 }
 
-pub async fn get_queue(_req: tide::Request<()>) -> tide::Result {
+#[get("/queue")]
+pub async fn get_queue() -> impl Responder {
     let mut mpd = mpd::get_instance().await;
-    let queue = mpd.playlist().await?;
+    let queue = mpd.playlist().await.unwrap();
-    let template = QueueTemplate { queue };
+    QueueTemplate { queue }
-    Ok(template.into())
 }
 
 #[derive(Deserialize)]
@@ -27,26 +28,26 @@ struct PostQueueQuery {
     play: bool,
 }
 
-pub async fn post_queue(req: tide::Request<()>) -> tide::Result {
+#[post("/queue")]
-    let query: PostQueueQuery = req.query()?;
+pub async fn post_queue(query: web::Query<PostQueueQuery>) -> impl Responder {
     let path = percent_decode_str(&query.path).decode_utf8_lossy();
     let mut mpd = mpd::get_instance().await;
 
     if query.replace {
-        mpd.clear().await?;
+        mpd.clear().await.unwrap();
     }
 
     if query.next {
-        mpd.add_pos(&path, "+0").await?;
+        mpd.add_position(&path, "+0").await.unwrap();
     } else {
-        mpd.add(&path).await?;
+        mpd.add(&path).await.unwrap();
     }
 
     if query.play {
-        mpd.play().await?;
+        mpd.play(None).await.unwrap();
     }
 
-    Ok("".into())
+    HttpResponse::NoContent()
 }
 
 #[derive(Deserialize)]
@@ -55,17 +56,16 @@ struct DeleteQueueQuery {
     id: Option<u32>,
 }
 
-pub async fn delete_queue(req: tide::Request<()>) -> tide::Result {
+#[delete("/queue")]
-    let query: DeleteQueueQuery = req.query()?;
+pub async fn delete_queue(query: web::Query<DeleteQueueQuery>) -> impl Responder {
-
     let mut mpd = mpd::get_instance().await;
     if let Some(id) = query.id {
-        mpd.command(&format!("deleteid {id}")).await?;
+        mpd.command(&format!("deleteid {id}")).await.unwrap();
     } else {
-        mpd.command("clear").await?;
+        mpd.command("clear").await.unwrap();
     }
 
-    Ok("".into())
+    HttpResponse::NoContent()
 }
 
 #[derive(Deserialize, Debug)]
@@ -74,10 +74,11 @@ struct UpdateQueueBody {
     to: u32,
 }
 
-pub async fn post_queue_move(mut req: tide::Request<()>) -> tide::Result {
+#[post("/queue/move")]
-    let body: UpdateQueueBody = req.body_json().await?;
+pub async fn post_queue_move(body: web::Json<UpdateQueueBody>) -> impl Responder {
     let mut mpd = mpd::get_instance().await;
     mpd.command(&format!("move {} {}", body.from, body.to))
-        .await?;
+        .await
-    Ok("".into())
+        .unwrap();
+    HttpResponse::NoContent()
 }

src/routes/sse.rs

@@ -0,0 +1,33 @@
+use std::time::Duration;
+
+use actix_web::{get, Responder};
+use actix_web_lab::sse;
+
+use crate::mpd::Mpd;
+
+#[get("/idle")]
+pub async fn idle() -> impl Responder {
+    let mut mpd = Mpd::new();
+    mpd.connect().await.unwrap();
+
+    const SYSTEMS: &[&str] = &["playlist", "player", "database", "options"];
+
+    let (tx, rx) = tokio::sync::mpsc::channel(10);
+    for system in SYSTEMS {
+        _ = tx
+            .send(sse::Data::new("").event(system.to_owned()).into())
+            .await;
+    }
+
+    actix_web::rt::spawn(async move {
+        loop {
+            let systems = mpd.idle(SYSTEMS).await.unwrap();
+
+            for system in systems {
+                _ = tx.send(sse::Data::new("").event(system).into()).await;
+            }
+        }
+    });
+
+    sse::Sse::from_infallible_receiver(rx).with_retry_duration(Duration::from_secs(10))
+}

static/style.css

@@ -28,15 +28,22 @@ button {
   background-color: transparent;
   border: none;
   color: inherit;
-  padding: 0;
   font-weight: bold;
   display: flex;
   line-height: 24px;
   cursor: pointer;
+  padding: 0.25rem 0.5rem;
 }
+
+button:hover {
+  background-color: rgba(255, 255, 255, 0.1);
+  border-radius: 0.25rem;
+}
+
 button .material-symbols-outlined {
   margin-right: 0.25rem;
 }
+
 .active {
   color: #99f;
 }
@@ -81,10 +88,6 @@ ul {
   align-items: center;
 }
 
-.queue-header button {
-  margin-left: 0.75rem;
-}
-
 .queue-next {
   font-weight: bold;
   flex: 1;
@@ -93,6 +96,7 @@ ul {
 .queue {
   margin-top: 0.5rem;
   overflow: auto;
+  scroll-behavior: smooth;
 }
 
 .queue ul li {
@@ -100,6 +104,10 @@ ul {
   border-radius: .25rem;
   display: flex;
   align-items: center;
+  cursor: grab;
+}
+.queue ul li:hover {
+  background-color: #223;
 }
 
 .queue ul li.playing {
@@ -131,28 +139,33 @@ ul {
   display: none;
 }
 
+.queue .remove button {
+  padding: 0.25rem;
+}
+
 .browser .header {
   display: flex;
   flex-flow: column;
   background-color: #334;
   border-radius: 0.25rem;
-  padding: 0.75rem 1rem;
+  padding: 0.75rem 0.5rem;
   margin: 16px 16px 0;
 }
 
 .browser .buttons {
   display: flex;
   flex-flow: row;
-  margin-top: 0.75rem;
+  margin-top: 0.25rem;
 }
 .browser .buttons button {
-  margin-right: 1.0rem;
+  margin-right: 0.5rem;
 }
 
 ul.breadcrumb {
   display: flex;
   flex-wrap: wrap;
   list-style: none;
+  margin-left: 0.5rem;
 }
 @media (prefers-contrast: more) {
   ul.breadcrumb {
@@ -214,6 +227,10 @@ ul.dir li .material-symbols-outlined {
 
 .albumart img {
   visibility: hidden;
+  border-radius: 0.25rem;
+  width: 100%;
+  height: 100%;
+  object-fit: cover;
 }
 
 .queue .albumart {
@@ -225,13 +242,6 @@ ul.dir li .material-symbols-outlined {
   margin-right: 0.75rem;
 }
 
-.albumart img {
-  border-radius: 0.25rem;
-  width: 100%;
-  height: 100%;
-  object-fit: cover;
-}
-
 .track {
   margin-right: 0.75rem;
 }
@@ -273,7 +283,11 @@ ul.dir li .material-symbols-outlined {
 .player .settings {
   display: flex;
   justify-content: space-around;
-  padding: 0 0.5rem 1.0rem;
+  padding: 0 0.5rem 0.25rem;
+}
+
+.player .settings {
+  margin-bottom: 0.5rem;
 }
 
 .player .controls button {

static/vendor/htmx-sse.js

@@ -5,7 +5,7 @@ This extension adds support for Server Sent Events to htmx.  See /www/extensions
 
 */
 
-(function(){
+(function() {
 
 	/** @type {import("../htmx").HtmxInternalApi} */
 	var api;
@@ -39,17 +39,19 @@ This extension adds support for Server Sent Events to htmx.  See /www/extensions
 
 			switch (name) {
 
-			// Try to remove remove an EventSource when elements are removed
+				case "htmx:beforeCleanupElement":
-			case "htmx:beforeCleanupElement":
+					var internalData = api.getInternalData(evt.target)
-				var internalData = api.getInternalData(evt.target)
+					// Try to remove remove an EventSource when elements are removed
-				if (internalData.sseEventSource) {
+					if (internalData.sseEventSource) {
-					internalData.sseEventSource.close();
+						internalData.sseEventSource.close();
-				}
+					}
-				return;
 
-			// Try to create EventSources when elements are processed
+					return;
-			case "htmx:afterProcessNode":
+
-				createEventSourceOnElement(evt.target);
+				// Try to create EventSources when elements are processed
+				case "htmx:afterProcessNode":
+					ensureEventSourceOnElement(evt.target);
+					registerSSE(evt.target);
 			}
 		}
 	});
@@ -66,8 +68,8 @@ This extension adds support for Server Sent Events to htmx.  See /www/extensions
 	 * @param {string} url 
 	 * @returns EventSource
 	 */
-	 function createEventSource(url) {
+	function createEventSource(url) {
-		return new EventSource(url, {withCredentials:true});
+		return new EventSource(url, { withCredentials: true });
 	}
 
 	function splitOnWhitespace(trigger) {
@@ -90,7 +92,7 @@ This extension adds support for Server Sent Events to htmx.  See /www/extensions
 	function getLegacySSESwaps(elt) {
 		var legacySSEValue = api.getAttributeValue(elt, "hx-sse");
 		var returnArr = [];
-		if (legacySSEValue) {
+		if (legacySSEValue != null) {
 			var values = splitOnWhitespace(legacySSEValue);
 			for (var i = 0; i < values.length; i++) {
 				var value = values[i].split(/:(.+)/);
@@ -103,63 +105,24 @@ This extension adds support for Server Sent Events to htmx.  See /www/extensions
 	}
 
 	/**
-	 * createEventSourceOnElement creates a new EventSource connection on the provided element.
+	 * registerSSE looks for attributes that can contain sse events, right 
-	 * If a usable EventSource already exists, then it is returned.  If not, then a new EventSource
+	 * now hx-trigger and sse-swap and adds listeners based on these attributes too
-	 * is created and stored in the element's internalData.
+	 * the closest event source
+	 *
 	 * @param {HTMLElement} elt
-	 * @param {number} retryCount
-	 * @returns {EventSource | null}
 	 */
-	function createEventSourceOnElement(elt, retryCount) {
+	function registerSSE(elt) {
-
+		// Find closest existing event source
-		if (elt == null) {
+		var sourceElement = api.getClosestMatch(elt, hasEventSource);
-			return null;
+		if (sourceElement == null) {
+			// api.triggerErrorEvent(elt, "htmx:noSSESourceError")
+			return null; // no eventsource in parentage, orphaned element
 		}
 
-		var internalData = api.getInternalData(elt);
+		// Set internalData and source
+		var internalData = api.getInternalData(sourceElement);
+		var source = internalData.sseEventSource;
 
-		// get URL from element's attribute
-		var sseURL = api.getAttributeValue(elt, "sse-connect");
-
-
-		if (sseURL == undefined) {
-			var legacyURL = getLegacySSEURL(elt)
-			if (legacyURL) {
-				sseURL = legacyURL;
-			} else {
-				return null;
-			}
-		}
-
-		// Connect to the EventSource
-		var source = htmx.createEventSource(sseURL);
-		internalData.sseEventSource = source;
-
-		// Create event handlers
-		source.onerror = function (err) {
-
-			// Log an error event
-			api.triggerErrorEvent(elt, "htmx:sseError", {error:err, source:source});
-
-			// If parent no longer exists in the document, then clean up this EventSource
-			if (maybeCloseSSESource(elt)) {
-				return;
-			}
-
-			// Otherwise, try to reconnect the EventSource
-			if (source.readyState === EventSource.CLOSED) {
-				retryCount = retryCount || 0;
-				var timeout = Math.random() * (2 ^ retryCount) * 500;
-				window.setTimeout(function() {
-					createEventSourceOnElement(elt, Math.min(7, retryCount+1));
-				}, timeout);
-			}			
-		};
-
-		source.onopen = function (evt) {
-			api.triggerEvent(elt, "htmx::sseOpen", {source: source});
-		}
-		
 		// Add message handlers for every `sse-swap` attribute
 		queryAttributeOnThisOrChildren(elt, "sse-swap").forEach(function(child) {
 
@@ -170,23 +133,27 @@ This extension adds support for Server Sent Events to htmx.  See /www/extensions
 				var sseEventNames = getLegacySSESwaps(child);
 			}
 
-			for (var i = 0 ; i < sseEventNames.length ; i++) {
+			for (var i = 0; i < sseEventNames.length; i++) {
 				var sseEventName = sseEventNames[i].trim();
 				var listener = function(event) {
 
-					// If the parent is missing then close SSE and remove listener
+					// If the source is missing then close SSE
-					if (maybeCloseSSESource(elt)) {
+					if (maybeCloseSSESource(sourceElement)) {
-						source.removeEventListener(sseEventName, listener);
 						return;
 					}
 
+					// If the body no longer contains the element, remove the listener
+					if (!api.bodyContains(child)) {
+						source.removeEventListener(sseEventName, listener);
+					}
+
 					// swap the response into the DOM and trigger a notification
 					swap(child, event.data);
 					api.triggerEvent(elt, "htmx:sseMessage", event);
 				};
 
 				// Register the new listener
-				api.getInternalData(elt).sseEventListener = listener;
+				api.getInternalData(child).sseEventListener = listener;
 				source.addEventListener(sseEventName, listener);
 			}
 		});
@@ -203,24 +170,86 @@ This extension adds support for Server Sent Events to htmx.  See /www/extensions
 			if (sseEventName.slice(0, 4) != "sse:") {
 				return;
 			}
+			
+			// remove the sse: prefix from here on out
+			sseEventName = sseEventName.substr(4);
 
-			var listener = function(event) {
+			var listener = function() {
-
+				if (maybeCloseSSESource(sourceElement)) {
-				// If parent is missing, then close SSE and remove listener
+					return
-				if (maybeCloseSSESource(elt)) {
-					source.removeEventListener(sseEventName, listener);
-					return;
 				}
 
-				// Trigger events to be handled by the rest of htmx
+				if (!api.bodyContains(child)) {
-				htmx.trigger(child, sseEventName, event);
+					source.removeEventListener(sseEventName, listener);
-				htmx.trigger(child, "htmx:sseMessage", event);
+				}
+			}
+		});
+	}
+
+	/**
+	 * ensureEventSourceOnElement creates a new EventSource connection on the provided element.
+	 * If a usable EventSource already exists, then it is returned.  If not, then a new EventSource
+	 * is created and stored in the element's internalData.
+	 * @param {HTMLElement} elt
+	 * @param {number} retryCount
+	 * @returns {EventSource | null}
+	 */
+	function ensureEventSourceOnElement(elt, retryCount) {
+
+		if (elt == null) {
+			return null;
+		}
+
+		// handle extension source creation attribute
+		queryAttributeOnThisOrChildren(elt, "sse-connect").forEach(function(child) {
+			var sseURL = api.getAttributeValue(child, "sse-connect");
+			if (sseURL == null) {
+				return;
 			}
 
-			// Register the new listener
+			ensureEventSource(child, sseURL, retryCount);
-			api.getInternalData(elt).sseEventListener = listener;
-			source.addEventListener(sseEventName.slice(4), listener);
 		});
+
+		// handle legacy sse, remove for HTMX2
+		queryAttributeOnThisOrChildren(elt, "hx-sse").forEach(function(child) {
+			var sseURL = getLegacySSEURL(child);
+			if (sseURL == null) {
+				return;
+			}
+
+			ensureEventSource(child, sseURL, retryCount);
+		});
+
+	}
+
+	function ensureEventSource(elt, url, retryCount) {
+		var source = htmx.createEventSource(url);
+
+		source.onerror = function(err) {
+
+			// Log an error event
+			api.triggerErrorEvent(elt, "htmx:sseError", { error: err, source: source });
+
+			// If parent no longer exists in the document, then clean up this EventSource
+			if (maybeCloseSSESource(elt)) {
+				return;
+			}
+
+			// Otherwise, try to reconnect the EventSource
+			if (source.readyState === EventSource.CLOSED) {
+				retryCount = retryCount || 0;
+				var timeout = Math.random() * (2 ^ retryCount) * 500;
+				window.setTimeout(function() {
+					ensureEventSourceOnElement(elt, Math.min(7, retryCount + 1));
+				}, timeout);
+			}
+		};
+
+		source.onopen = function(evt) {
+			api.triggerEvent(elt, "htmx:sseOpen", { source: source });
+		}
+
+		api.getInternalData(elt).sseEventSource = source;
 	}
 
 	/**
@@ -253,12 +282,12 @@ This extension adds support for Server Sent Events to htmx.  See /www/extensions
 		var result = [];
 
 		// If the parent element also contains the requested attribute, then add it to the results too.
-		if (api.hasAttribute(elt, attributeName) || api.hasAttribute(elt, "hx-sse")) {
+		if (api.hasAttribute(elt, attributeName)) {
 			result.push(elt);
 		}
 
 		// Search all child nodes that match the requested attribute
-		elt.querySelectorAll("[" + attributeName + "], [data-" + attributeName + "], [hx-sse], [data-hx-sse]").forEach(function(node) {
+		elt.querySelectorAll("[" + attributeName + "], [data-" + attributeName + "]").forEach(function(node) {
 			result.push(node);
 		});
 
@@ -281,7 +310,7 @@ This extension adds support for Server Sent Events to htmx.  See /www/extensions
 
 		api.selectAndSwap(swapSpec.swapStyle, target, elt, content, settleInfo);
 
-		settleInfo.elts.forEach(function (elt) {
+		settleInfo.elts.forEach(function(elt) {
 			if (elt.classList) {
 				elt.classList.add(htmx.config.settlingClass);
 			}
@@ -306,11 +335,11 @@ This extension adds support for Server Sent Events to htmx.  See /www/extensions
 	function doSettle(settleInfo) {
 
 		return function() {
-			settleInfo.tasks.forEach(function (task) {
+			settleInfo.tasks.forEach(function(task) {
 				task.call();
 			});
 
-			settleInfo.elts.forEach(function (elt) {
+			settleInfo.elts.forEach(function(elt) {
 				if (elt.classList) {
 					elt.classList.remove(htmx.config.settlingClass);
 				}
@@ -319,4 +348,8 @@ This extension adds support for Server Sent Events to htmx.  See /www/extensions
 		}
 	}
 
-})();
+	function hasEventSource(node) {
+		return api.getInternalData(node).sseEventSource != null;
+	}
+
+})();

templates/index.html

@@ -24,7 +24,7 @@
     </script>
   </head>
 
-  <body hx-ext="sse" sse-connect="/sse">
+  <body hx-ext="sse" sse-connect="/idle">
     <div 
       class="browser" 
       hx-trigger="load,sse:database"

templates/queue.html

@@ -3,7 +3,12 @@
 
 <ul>
   {% for item in queue %}
-  <li {% if item.playing %}class="playing"{% endif %}>
+  <li
+    {% if item.playing %}class="playing"{% endif %}
+    hx-post="/play?position={{ item.position|urlencode }}"
+    hx-trigger="click,keyup[key='Enter']"
+    hx-swap="none"
+  >
     <div class="albumart">
       <img
         src="/art?path={{ item.file|urlencode }}"
@@ -26,6 +31,14 @@
 
 <script>
 htmx.onLoad(() => {
+  const scrollCurrentSongIntoView = () => {
+    const hoveredSong = document.querySelector(".queue li:hover");
+    if (hoveredSong === null) {
+      const currentSong = document.querySelector(".queue li.playing");
+      currentSong?.scrollIntoView({ block: "nearest" });
+    }
+  }
+
   const isReduced = window
     .matchMedia("(prefers-reduced-motion: reduce)")
     .matches;
@@ -38,5 +51,7 @@ htmx.onLoad(() => {
       body: JSON.stringify({from: event.oldIndex, to: event.newIndex}),
     }),
   });
+
+  scrollCurrentSongIntoView();
 });
 </script>