anygatecloud/strom
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix register(critical)?untilLatest being inverted

Browse Source
This commit is contained in:
Admin Else
2026-03-29 21:08:48 +02:00
parent 4bfaf9b7c5
commit 420ec5611c
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/login.go
+4 -4
View File
@@ -130,10 +130,10 @@ func LoginRaw(c *proto.Conn, account *api.Account, addr string) (err error) {
} }
lc.RegisterCritical(lc.OnDefault) lc.RegisterCritical(lc.OnDefault)
lc.RegisterCritical(lc.OnClose) lc.RegisterCritical(lc.OnClose)
lc.RegisterUntilLatest(lc.OnCompress) lc.RegisterCriticalUntilLatest(lc.OnCompress)
lc.RegisterUntilLatest(lc.OnEncrypt) lc.RegisterCriticalUntilLatest(lc.OnEncrypt)
lc.RegisterUntilLatest(lc.OnDisconnect) lc.RegisterCriticalUntilLatest(lc.OnDisconnect)
lc.RegisterUntilLatest(lc.OnSuccess) lc.RegisterCriticalUntilLatest(lc.OnSuccess)
p, err := MakeHandshakePacket(lc.Conn, proto_base.Login) p, err := MakeHandshakePacket(lc.Conn, proto_base.Login)
if err != nil { if err != nil {
proto/smart_convert.go
+2 -2
View File
@@ -125,9 +125,9 @@ func (c *Conn) registerUntil(h any, until string, critical bool) {
return v.Interface().(error) return v.Interface().(error)
} }
if critical { if critical {
c.RegisterCustomType(newT, reflect.ValueOf(handleFunc))
} else {
c.RegisterDirect(newT, reflect.ValueOf(handleFunc)) c.RegisterDirect(newT, reflect.ValueOf(handleFunc))
} else {
c.RegisterCustomType(newT, reflect.ValueOf(handleFunc))
} }
} }
} }
server/login_server.go
+5 -5
View File
@@ -161,11 +161,11 @@ func ServeLogin(c *proto.Conn, settings ...LoginServerSetting) (ret *LoginServer
ret = &LoginServer{Conn: c} ret = &LoginServer{Conn: c}
ret.RegisterCritical(ret.OnDefault) ret.RegisterCritical(ret.OnDefault)
ret.RegisterIgnore(event.Close{}) ret.RegisterIgnore(event.Close{})
ret.RegisterUntilLatest(ret.OnHandshake) ret.RegisterCriticalUntilLatest(ret.OnHandshake)
ret.RegisterUntilLatest(ret.OnLoginStart) ret.RegisterCriticalUntilLatest(ret.OnLoginStart)
ret.RegisterUntilLatest(ret.OnLoginAcknowledged) ret.RegisterCriticalUntilLatest(ret.OnLoginAcknowledged)
ret.RegisterUntilLatest(ret.OnStatusRequest) ret.RegisterCriticalUntilLatest(ret.OnStatusRequest)
ret.RegisterUntilLatest(ret.OnStatusPing) ret.RegisterCriticalUntilLatest(ret.OnStatusPing)
for _, s := range settings { for _, s := range settings {
s(ret) s(ret)
} }