0.1.6: fix stall on empty batch

Author: hackermondev

Cargo.lock

@@ -9,7 +9,7 @@ cargo add batched
 Or add this to your `Cargo.toml`:
 ```toml
 [dependencies]
-batched = "0.1.5"
+batched = "0.1.6"
 ```
 
 ## #[batched]

README.md

@@ -1,7 +1,7 @@
 [package]
 name = "batched"
 description = "rust macro util for batching expensive operations"
-version = "0.1.5"
+version = "0.1.6"
 edition = "2024"
 license = "MIT"
 readme = "../README.md"
@@ -10,7 +10,7 @@ keywords = ["batch", "performance", "efficient"]
 
 
 [dependencies]
-batched_derive = { version = "0.1.5", path = "../batched_derive" }
+batched_derive = { version = "0.1.6", path = "../batched_derive" }
 
 [dev-dependencies]
 tokio = { version = "1.44.2", features = ["full"] }

batched/Cargo.toml

@@ -1,4 +1,4 @@
-use std::time::Instant;
+use std::time::{Duration, Instant};
 
 use batched::batched;
 
@@ -10,9 +10,7 @@ async fn simple() {
     }
 
     for _ in 0..99 {
-        tokio::task::spawn(async move { 
-            add_multiple(vec![1, 1, 1]).await
-        });
+        tokio::task::spawn(async move { add_multiple(vec![1, 1, 1]).await });
     }
 
     let total = add_multiple(vec![1, 1, 1]).await;
@@ -31,6 +29,17 @@ async fn propagates_errors() {
     assert_eq!(result.is_err(), true);
 }
 
+#[tokio::test]
+async fn empty_batch_works() {
+    #[batched(window = 100, limit = 1000)]
+    fn add(numbers: Vec<u32>) -> u32 {
+        numbers.iter().sum()
+    }
+
+    let timeout = tokio::time::timeout(Duration::from_secs(1), add_multiple(vec![])).await;
+    timeout.expect("batch timed out");
+}
+
 #[tokio::test]
 async fn batched_window_works() {
     #[batched(window = 1000, limit = 1000)]
@@ -42,4 +51,4 @@ async fn batched_window_works() {
     add_multiple(vec![1, 1, 1]).await;
     let after = before.elapsed();
     assert!(after.as_secs() == 1);
-}
+}

batched/tests/test.rs

@@ -1,7 +1,7 @@
 [package]
 name = "batched_derive"
 description = "rust macro util for batching expensive operations"
-version = "0.1.5"
+version = "0.1.6"
 edition = "2024"
 license = "MIT"
 readme = "../README.md"

batched_derive/Cargo.toml

@@ -55,6 +55,7 @@ pub fn build_code(call_function: Function, options: Attributes) -> TokenStream {
 
                 loop {
                     let mut timer = tokio::time::interval(window);
+                    let mut recieved_first_batch = false;
 
                     loop {
                         tokio::select! {
@@ -63,9 +64,10 @@ pub fn build_code(call_function: Function, options: Attributes) -> TokenStream {
                                     return;
                                 }
 
-                                if buffer.is_empty() {
+                                if !recieved_first_batch {
                                     timer.reset();
                                 }
+                                recieved_first_batch = true;
 
                                 let (mut calls, channel) = event.unwrap();
                                 buffer.append(&mut calls);
@@ -76,7 +78,7 @@ pub fn build_code(call_function: Function, options: Attributes) -> TokenStream {
                             }
 
                             _ = async {
-                                if buffer.is_empty() {
+                                if !recieved_first_batch {
                                     std::future::pending().await
                                 } else {
                                     timer.tick().await