Merge pull request #139 from arkedge/fix-serialport-leak

Close all streams even if any stream closed normally
arkedge · Jan 29, 2025 · b271d33 · b271d33
2 parents d1ee93d + 198c4b3
commit b271d33
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/kble-serialport/src/main.rs b/kble-serialport/src/main.rs
@@ -159,7 +159,9 @@ async fn handle_ws(ws: WebSocket, serialport: SerialStream) {
             let chunk = chunk?;
             tx.write_all(&chunk).await?;
         }
+        tx.flush().await?;
         anyhow::Ok(())
     };
-    futures::future::try_join(rx_fut, tx_fut).await.ok();
+    tokio::pin!(rx_fut, tx_fut);
+    futures::future::try_select(rx_fut, tx_fut).await.ok();
 }