fix(ui): gracefully stop TUI on signals and make Stop idempotent#7
Merged
Conversation
Listen for SIGINT/SIGHUP/SIGTERM/SIGQUIT and trigger Stop. Guard cleanup with sync.Once so Stop is safe to call repeatedly, and defer tviewApp.Stop() to the UI thread via AfterDrawFunc to avoid deadlock when invoked from the signal goroutine. A stopping flag short-circuits Run() if shutdown is requested before the event loop starts.
There was a problem hiding this comment.
Pull request overview
This PR improves c-ray’s TUI shutdown path so the terminal is reliably restored when the process receives OS signals (e.g., SIGINT from Ctrl-C in SSH/launcher contexts), routing those exits through the same cleanup logic as in-app key handling and making shutdown requests safe to repeat.
Changes:
- Add process signal handling (
SIGINT,SIGHUP,SIGTERM,SIGQUIT) to triggerApp.Stop()duringRun(). - Make
App.Stop()idempotent viasync.Onceand an atomicstoppingflag. - Add a first-draw guard to ensure stop requests during early startup still result in the TUI being stopped cleanly.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary
Fix TUI shutdown handling so
crayrestores the terminal when it receives process-level exit signals.Previously, Ctrl-C was only handled when delivered through tcell as a key event. In SSH or launcher scenarios, Ctrl-C may arrive as a real
SIGINT, causing the Go process to exit directly and bypass tview/tcell cleanup. That could leave the terminal in a broken raw/alternate-screen state.fix: #6
Changes
SIGINT,SIGHUP,SIGTERM, andSIGQUITduring TUI execution.App.Stop()cleanup path as keyboard exits.App.Stop()idempotent so repeated stop requests are safe.