Connect.Will also returns delay

Author: gregoryv

changelog.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on http://keepachangelog.com/en/1.0.0/
 and this project adheres to http://semver.org/spec/v2.0.0.html.
 
+## [0.28.1-dev]
+
+- Connect.Will returns WillDelayInterval delay
+
 ## [0.28.0] 2024-09-21
 
 - Fix Subscribe.subscriptionID is optional

connect.go

@@ -75,8 +75,8 @@ func (p *Connect) SetWill(will *Publish, delayInterval uint32) {
 	p.setWillQoS(will.QoS())
 }
 
-func (p *Connect) Will() *Publish {
-	return p.will
+func (p *Connect) Will() (*Publish, time.Duration) {
+	return p.will, time.Duration(p.willDelayInterval) * time.Second
 }
 
 func (p *Connect) HasFlag(v byte) bool { return p.flags.Has(v) }

connect_test.go

@@ -9,6 +9,7 @@ import (
 	"regexp"
 	"strings"
 	"testing"
+	"time"
 
 	"github.com/eclipse/paho.golang/packets"
 	"github.com/gregoryv/asserter"
@@ -72,7 +73,7 @@ func TestConnect(t *testing.T) {
 	if got := c.String(); !strings.Contains(got, "CONNECT") {
 		t.Error(got)
 	}
-	if v := c.Will(); v != nil {
+	if v, _ := c.Will(); v != nil {
 		t.Error("no will was set but got", v)
 	}
 	testControlPacket(t, c)
@@ -191,7 +192,7 @@ func TestCompareConnect(t *testing.T) {
 		//p.SetCorrelationData([]byte("11-22-33")) doesn't work in paho
 		our.SetWill(p, 3)
 	}
-	will := our.Will()
+	will, delay := our.Will()
 	the.WillRetain = will.Retain()
 	the.WillFlag = our.HasFlag(WillFlag)
 	the.WillTopic = will.TopicName()
@@ -205,7 +206,7 @@ func TestCompareConnect(t *testing.T) {
 		Key:   "connected",
 		Value: "2022-01-01 14:44:32",
 	})
-	wExp := uint32(3) // seconds
+	wExp := uint32(delay / time.Second) // seconds
 	the.WillProperties.WillDelayInterval = &wExp
 
 	// possible bug in Properties.Pack