From 097e0a6fb28bbead5c77524d9467a8fda674d47b Mon Sep 17 00:00:00 2001
From: Ali Najafizadeh <a.najafizadeh@gmail.com>
Date: Sun, 19 May 2024 06:43:14 -0400
Subject: [PATCH] Fix an issue related to delay confirm values

---
 client/client.go | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/client/client.go b/client/client.go
index 5dea658..d5c4ae0 100644
--- a/client/client.go
+++ b/client/client.go
@@ -195,6 +195,10 @@ func (c *Client) Get(ctx context.Context, consumerOpts ...bus.ConsumerOpt) iter.
 					}
 				}
 
+				if !yield(msg, err) {
+					return
+				}
+
 				for _, evt := range events {
 					if evt.ReplyCount > 0 {
 						confirmEvent, err := bus.NewEvent(bus.WithSubject(evt.Reply), bus.WithData([]byte(`{"type":"confirm"}`)))
@@ -212,13 +216,15 @@ func (c *Client) Get(ctx context.Context, consumerOpts ...bus.ConsumerOpt) iter.
 				events = nil
 				msg = nil
 				err = fmt.Errorf("%s", incoming.Data)
+
+				if !yield(msg, err) {
+					return
+				}
+
 			case "done":
 				return
 			}
 
-			if !yield(msg, err) {
-				break
-			}
 		}
 	}
 }