Repository navigation
fix(core): 顶号流程按 playerId 串行化 #734
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.
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
AlianBlank
merged 2 commits into
main
from
feature/auto-server-source-worker-run-12215-20261027T0410
Oct 28, 2026
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Script executed:
Repository: GameFrameX/GameFrameX.Server.Source
Length of output: 12947
Script executed:
Repository: GameFrameX/GameFrameX.Server.Source
Length of output: 14126
Script executed:
Repository: GameFrameX/GameFrameX.Server.Source
Length of output: 15495
Script executed:
Repository: GameFrameX/GameFrameX.Server.Source
Length of output: 15478
Script executed:
Repository: GameFrameX/GameFrameX.Server.Source
Length of output: 29139
Script executed:
Repository: GameFrameX/GameFrameX.Server.Source
Length of output: 29139
Script executed:
Repository: GameFrameX/GameFrameX.Server.Source
Length of output: 25758
在处理旧会话前检查当前会话,并在通知后再次检查。
Remove(sessionId)不使用playerId登录锁。断开回调可以在UpdateSessionAsync等待锁时移除新会话。当前代码随后仍会通知、关闭并移除旧会话,最后才发现新会话不存在并返回。基线也在处理旧会话后才检查当前会话,但本次新增的登录锁等待扩大了该交错窗口。请至少增加持锁后的首次检查,并在异步通知返回后、关闭旧会话前再次检查。
建议修改
var loginLock = await AcquireLoginLockAsync(playerId); try { + var session = Get(sessionId); + if (session.IsNull()) + { + return; + } + // 获取与玩家ID关联的旧会话;同一会话重登(同 sessionId)不触发顶号,幂等重绑 var oldSession = GetByPlayerId(playerId); if (oldSession != null && oldSession.SessionId != sessionId) { // 内联 await 顶号通知(须先于 Close,理由见参数注释) await duplicateLoginNotifier(oldSession); + if (Get(sessionId).IsNull()) + { + return; + } + // 清除旧会话的连接数据并关闭连接 oldSession.WorkChannel.ClearData(); oldSession.WorkChannel.Close(); // 这里先移除,等待Disconnected回调断开在移除的话有延迟 Remove(oldSession.SessionId); } // 获取当前会话并更新玩家ID和签名 - var session = Get(sessionId); + session = Get(sessionId); if (session.IsNull()) { return; }