removed early return on error when checking dispenser status in the start and final loops

dispenser/dispenserclient.go

@@ -279,7 +279,9 @@ func (c *Client) DispenserStart(ctx context.Context) (string, error) {
 		return stockStatus, fmt.Errorf("[%s] check status: %w", funcName, err)
 	}
 
-	logStatus(status)
+	defer func() {
+		logStatus(status)
+	}()
 	stockStatus = stockTake(status)
 	c.setStock(status)
 
@@ -294,48 +296,75 @@ func (c *Client) DispenserStart(ctx context.Context) (string, error) {
 		return stockStatus, fmt.Errorf("[%s] to encoder: %w", funcName, err)
 	}
 
-	time.Sleep(delay)
-	status, err = c.CheckStatus(ctx)
-	if err != nil {
-		return stockStatus, fmt.Errorf("[%s] re-check status: %w", funcName, err)
-	}
-	logStatus(status)
-	stockStatus = stockTake(status)
-	c.setStock(status)
+	deadline := time.Now().Add(6 * time.Second)
 
-	return stockStatus, nil
+	for {
+		time.Sleep(delay * 2)
+		if time.Now().After(deadline) {
+			return stockStatus, nil
+		}
+
+		status, _ = c.do(ctx, cmdStatus)
+
+		stockStatus = stockTake(status)
+		c.setStock(status)
+		logStatus(status)
+
+		// error states first
+		if isCardWellEmpty(status) {
+			return stockStatus, fmt.Errorf(stockStatus)
+		}
+
+		if isAtEncoderPosition(status) {
+			return stockStatus, nil
+		}
+	}
 }
 
 func (c *Client) DispenserFinal(ctx context.Context) (string, error) {
 	const funcName = "DispenserFinal"
 	stockStatus := ""
+	var status []byte
 
 	if err := c.OutOfMouth(ctx); err != nil {
 		return stockStatus, fmt.Errorf("[%s] out of mouth: %w", funcName, err)
 	}
 
 	time.Sleep(delay)
-	status, err := c.CheckStatus(ctx)
-	if err != nil {
-		return stockStatus, fmt.Errorf("[%s] check status: %w", funcName, err)
+	status, err := c.do(ctx, cmdStatus)
+	if err == nil && len(status) >= 4 {
+		c.setStock(status)
 	}
-	logStatus(status)
-	stockStatus = stockTake(status)
-	c.setStock(status)
 
 	time.Sleep(delay)
 	if err := c.ToEncoder(ctx); err != nil {
 		return stockStatus, fmt.Errorf("[%s] to encoder: %w", funcName, err)
 	}
 
-	time.Sleep(delay)
-	status, err = c.CheckStatus(ctx)
-	if err != nil {
-		return stockStatus, fmt.Errorf("[%s] re-check status: %w", funcName, err)
-	}
-	logStatus(status)
-	stockStatus = stockTake(status)
-	c.setStock(status)
+	defer func() {
+		logStatus(status)
+	}()
 
-	return stockStatus, nil
+	deadline := time.Now().Add(6 * time.Second)
+
+	for {
+		time.Sleep(delay * 2)
+		if time.Now().After(deadline) {
+			return stockStatus, nil
+		}
+
+		status, _ = c.do(ctx, cmdStatus)
+
+		stockStatus = stockTake(status)
+		c.setStock(status)
+		logStatus(status)
+
+		if isCardWellEmpty(status) {
+			return stockStatus, nil
+		}
+
+		if isAtEncoderPosition(status) {
+			return stockStatus, nil
+		}
+	}
 }

handlers/handlers.go

@@ -191,6 +191,7 @@ func (app *App) takePayment(w http.ResponseWriter, r *http.Request) {
 			writeTransactionResult(w, http.StatusServiceUnavailable, theResponse)
 			return
 		}
+		
 	}
 
 	if r.Method == http.MethodOptions {

main.go

@@ -29,7 +29,7 @@ import (
 )
 
 const (
-	buildVersion     = "1.2.2"
+	buildVersion     = "1.2.5"
 	serviceName      = "hardlink"
 	pollingFrequency = 8 * time.Second
 )

release notes.md

@@ -2,6 +2,15 @@
 
 builtVersion is a const in main.go
 
+#### 1.2.5 - 20 March 2026
+removed early return on error when checking dispenser status in the start and final loops.
+
+#### 1.2.4 - 18 March 2026
+added check if keycard at the encoder position before trying to encode key
+
+#### 1.2.3 - 17 March 2026
+added check if keycard at the encoder position before trying to encode key
+
 #### 1.2.2 - 11 February 2026
 increased waiting time befor sending email on PDQ unavailability to 30 seconds day time and 10 minutes night time
 to give it a chance to become available again