Skip to content

Send Reset if the ResetTime elapsed in between checks #725

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Aug 7, 2025
Merged

Send Reset if the ResetTime elapsed in between checks #725

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5b68992
reset seq numbers if elapsed in between checks
JackChalmers Aug 7, 2025
2fe3f12
Merge remote-tracking branch 'origin' into test-for-reset-seq-time
JackChalmers Aug 7, 2025
1899c8f
update comment desc
JackChalmers Aug 7, 2025
f83e8a8
local tz tests
JackChalmers Aug 7, 2025
cec0770
update conditional and add UT for multiple days after reset time was set
JackChalmers Aug 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions internal/session_settings.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ type SessionSettings struct {
TimeZone *time.Location
ResetSeqTime time.Time
EnableResetSeqTime bool
LastCheckedResetSeqTime time.Time
Copy link
Contributor

@michaelwilner michaelwilner Aug 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a session settings struct and this variable does not belong here


// Required on logon for FIX.T.1 messages.
DefaultApplVerID string
Expand Down
1 change: 1 addition & 0 deletions session_factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,7 @@ func (f sessionFactory) newSession(
}
s.EnableResetSeqTime = true
s.ResetSeqTime = seqTime
s.LastCheckedResetSeqTime = seqTime
Copy link
Contributor

@michaelwilner michaelwilner Aug 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does not belong here

} else {
s.EnableResetSeqTime = false
}
Expand Down
6 changes: 3 additions & 3 deletions session_state.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,11 +157,11 @@ 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() {
// If we have crossed the reset time boundary in between checks, we send the reset
if session.LastCheckedResetSeqTime.Before(session.ResetSeqTime) && now.After(session.ResetSeqTime) && session.stateMachine.State.IsConnected() {
Copy link
Contributor

@michaelwilner michaelwilner Aug 7, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will not work. The session.ResetSeqTime, when parsed with the short form string in the session factory, will correspond to the time of the parse only. It will not reflect "today's" reset seq time.

In addition, the last checked reset seq time should be initialized to zero, so this method needs to ensure that the last checked reset seq time must have been set previously before passing this condition

session.sendLogonInReplyTo(true, nil)
}
session.LastCheckedResetSeqTime = now
}
}

Expand Down
161 changes: 159 additions & 2 deletions session_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1010,20 +1010,24 @@ func (s *SessionSuite) TestSeqNumResetTime() {
s.session.ResetSeqTime = now
s.session.EnableResetSeqTime = true

s.NextSenderMsgSeqNum(1)
s.NextTargetMsgSeqNum(1)
s.IncrNextSenderMsgSeqNum()
s.IncrNextTargetMsgSeqNum()

s.MockApp.On("ToAdmin")

s.NextSenderMsgSeqNum(2)
s.NextTargetMsgSeqNum(2)
s.IncrNextSenderMsgSeqNum()
s.IncrNextTargetMsgSeqNum()

s.MockApp.On("ToAdmin")

s.session.CheckResetTime(s.session, now)

s.NextSenderMsgSeqNum(2)
s.NextSenderMsgSeqNum(2)
s.NextSenderMsgSeqNum(3)
s.NextSenderMsgSeqNum(3)

}

Expand Down Expand Up @@ -1052,3 +1056,156 @@ 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)
}

func (s *SessionSuite) TestSeqNumResetTimeDisconnected_LocalTZ() {
s.session.State = logonState{}
tz, err := time.LoadLocation("America/Chicago")
if err != nil {
s.T().Fatal(err)
}
s.session.TimeZone = tz
s.session.ResetSeqTime = time.Now().In(tz).Add(time.Second * 2)
s.session.EnableResetSeqTime = true

s.NextSenderMsgSeqNum(1)
s.NextTargetMsgSeqNum(1)
s.IncrNextTargetMsgSeqNum()
s.IncrNextSenderMsgSeqNum()
s.NextSenderMsgSeqNum(2)
s.NextTargetMsgSeqNum(2)

s.session.onAdmin(stopReq{})
s.Disconnected()
s.Stopped()

// Wait for reset time to pass.
time.Sleep(time.Second * 3)

s.MockApp.On("ToAdmin")
// Disconnected so the seq numbers should not be reset.
s.session.CheckResetTime(s.session, time.Now().UTC())
s.NextSenderMsgSeqNum(2)
s.NextTargetMsgSeqNum(2)
}

func (s *SessionSuite) TestSeqNumResetTimeAfterElapse_LocalTZ() {
s.session.State = logonState{}
tz, err := time.LoadLocation("America/Chicago")
if err != nil {
s.T().Fatal(err)
}
s.session.TimeZone = tz
before := time.Now().In(tz)
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.LastCheckedResetSeqTime = before
s.session.CheckResetTime(s.session, after)
s.NextSenderMsgSeqNum(2)
s.NextTargetMsgSeqNum(1)
}

func (s *SessionSuite) TestSeqNumResetTimeNotAfterDisconnect_LocalTZ() {
s.session.State = logonState{}
tz, err := time.LoadLocation("America/Chicago")
if err != nil {
s.T().Fatal(err)
}
s.session.TimeZone = tz
before := time.Now().In(tz)
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)
}
Loading