fix(serve): websocket implementation

Cargo.toml

@@ -25,6 +25,7 @@ notify = { version = "6.1.1", optional = true }
 tokio = { version = "1.35.1", features = [ "rt-multi-thread" ], optional = true }
 warp = { version = "0.3.6", optional = true }
 futures = { version = "0.3.30", optional = true }
+async-lock = "3.2.0"
 
 [features]
 default = [ "cli" ]

blog/templates/layout.hbs

@@ -14,7 +14,6 @@
       <script>
        const socket = new WebSocket(`ws://${location.host}` + "/" + "{{{ livereload }}}");
        socket.onmessage = function (event) {
-         console.log(event)
          if (event.data === "reload") {
            socket.close();
            location.reload();

src/cmd/serve.rs

@@ -2,14 +2,15 @@
 
 use crate::{cmd::Watch, LIVERELOAD_ENDPOINT};
 use anyhow::Result;
+use async_lock::Mutex;
 use ccli::{clap, clap::Parser};
 use futures::{sink::SinkExt, FutureExt, StreamExt};
 use notify::Event;
 use std::{
     net::{Ipv4Addr, TcpListener},
     sync::{
         mpsc::{self, Receiver},
-        Arc, Mutex,
+        Arc,
     },
 };
 use tokio::runtime::Runtime;
@@ -59,9 +60,10 @@ impl Serve {
             .map(|ws: Ws, rx: Arc<Mutex<Receiver<Event>>>| {
                 ws.on_upgrade(move |socket: WebSocket| async move {
                     let (mut tx, _) = socket.split();
-                    if let Ok(rx) = rx.lock() {
-                        if rx.recv().is_ok() {
-                            let _ = tx.send(Message::text("reload"));
+                    let rx = rx.lock().await;
+                    if rx.recv().is_ok() {
+                        if let Err(e) = tx.send(Message::text("reload")).await {
+                            tracing::error!("failed to send reload message: {}", e);
                         }
                     }
                 })