reset seq numbers if elapsed in between checks

Author: JackChalmers

internal/session_settings.go

@@ -21,6 +21,7 @@ type SessionSettings struct {
 	TimeZone                     *time.Location
 	ResetSeqTime                 time.Time
 	EnableResetSeqTime           bool
+	LastCheckedResetSeqTime      time.Time
 
 	// Required on logon for FIX.T.1 messages.
 	DefaultApplVerID string

session_factory.go

@@ -388,6 +388,7 @@ func (f sessionFactory) newSession(
 		}
 		s.EnableResetSeqTime = true
 		s.ResetSeqTime = seqTime
+		s.LastCheckedResetSeqTime = seqTime
 	} else {
 		s.EnableResetSeqTime = false
 	}

session_state.go

@@ -157,11 +157,13 @@ func (sm *stateMachine) CheckSessionTime(session *session, now time.Time) {
 
 func (sm *stateMachine) CheckResetTime(session *session, now time.Time) {
 	if session.EnableResetSeqTime {
-		if session.ResetSeqTime.Hour() == now.Hour() &&
-			session.ResetSeqTime.Minute() == now.Minute() &&
-			session.ResetSeqTime.Second() == now.Second() {
+		// The last time we checked the reset time was before the configured reset time
+		// and the current time is after the configured reset time.
+		// so that means we've crossed the reset time boundary.
+		if session.LastCheckedResetSeqTime.Before(session.ResetSeqTime) && now.After(session.ResetSeqTime) && session.stateMachine.State.IsConnected() {
 			session.sendLogonInReplyTo(true, nil)
 		}
+		session.LastCheckedResetSeqTime = now
 	}
 }
 

session_test.go

@@ -1052,3 +1052,59 @@ func (s *SessionSuite) TestSeqNumResetTimeDisconnected() {
 	s.NextSenderMsgSeqNum(2)
 	s.NextTargetMsgSeqNum(2)
 }
+
+func (s *SessionSuite) TestSeqNumResetTimeAfterElapse() {
+	s.session.State = logonState{}
+	before := time.Now().UTC()
+	resetTime := time.Now().UTC().Add(time.Second * 2)
+	after := resetTime.Add(time.Second * 1)
+	s.session.ResetSeqTime = resetTime
+	s.session.EnableResetSeqTime = true
+
+	s.NextSenderMsgSeqNum(1)
+	s.NextTargetMsgSeqNum(1)
+	s.IncrNextTargetMsgSeqNum()
+	s.IncrNextSenderMsgSeqNum()
+	s.NextSenderMsgSeqNum(2)
+	s.NextTargetMsgSeqNum(2)
+
+	s.MockApp.On("ToAdmin")
+	s.session.CheckResetTime(s.session, before)
+	s.NextSenderMsgSeqNum(2)
+	s.NextTargetMsgSeqNum(2)
+
+	s.session.LastCheckedResetSeqTime = before
+	s.session.CheckResetTime(s.session, after)
+	s.NextSenderMsgSeqNum(2)
+	s.NextTargetMsgSeqNum(1)
+}
+
+func (s *SessionSuite) TestSeqNumResetTimeNotAfterDisconnect() {
+	s.session.State = logonState{}
+	before := time.Now().UTC()
+	resetTime := before.Add(time.Second * 2)
+	after := resetTime.Add(time.Second * 1)
+	s.session.ResetSeqTime = resetTime
+	s.session.EnableResetSeqTime = true
+
+	s.NextSenderMsgSeqNum(1)
+	s.NextTargetMsgSeqNum(1)
+	s.IncrNextTargetMsgSeqNum()
+	s.IncrNextSenderMsgSeqNum()
+	s.NextSenderMsgSeqNum(2)
+	s.NextTargetMsgSeqNum(2)
+
+	s.MockApp.On("ToAdmin")
+	s.session.CheckResetTime(s.session, before)
+	s.NextSenderMsgSeqNum(2)
+	s.NextTargetMsgSeqNum(2)
+
+	s.session.onAdmin(stopReq{})
+	s.Disconnected()
+	s.Stopped()
+
+	s.session.LastCheckedResetSeqTime = before
+	s.session.CheckResetTime(s.session, after)
+	s.NextSenderMsgSeqNum(2)
+	s.NextTargetMsgSeqNum(2)
+}