Skip to content

fix: kill ttyd process on early exit from Evaluate #737

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

Open
tomenden wants to merge 1 commit into
base: main
Choose a base branch
from
+9 −1
Open

fix: kill ttyd process on early exit from Evaluate #737

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion evaluator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,12 @@ func Evaluate(ctx context.Context, tape string, out io.Writer, opts ...Evaluator
if err := v.Start(); err != nil {
return []error{err}
}
defer func() { _ = v.close() }()
defer func() {
_ = v.close()
if v.tty != nil && v.tty.Process != nil {
_ = v.tty.Process.Kill()
}
}()

// Let's wait until we can access the window.term variable.
//
Expand Down
3 changes: 3 additions & 0 deletions vhs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,11 +140,14 @@ func (vhs *VHS) Start() error {
enableNoSandbox := os.Getenv("VHS_NO_SANDBOX") != ""
u, err := launcher.New().Leakless(false).Bin(path).NoSandbox(enableNoSandbox).Launch()
if err != nil {
_ = vhs.tty.Process.Kill()
return fmt.Errorf("could not launch browser: %w", err)
}
browser := rod.New().ControlURL(u).MustConnect()
page, err := browser.Page(proto.TargetCreateTarget{URL: fmt.Sprintf("http://localhost:%d", port)})
if err != nil {
browser.MustClose()
_ = vhs.tty.Process.Kill()
return fmt.Errorf("could not open ttyd: %w", err)
}

Expand Down