Andreas/gotty
1
0
Fork 0
mirror of https://github.com/yudai/gotty.git synced 2025-12-24 11:20:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

bug: fix issues w/ closed connection not closing running process

Browse source
This commit is contained in:
Will Owens 2025-10-26 08:58:19 -05:00
parent 71b9db14e2
commit c830287cb0
No known key found for this signature in database
GPG key ID: 8C8384B16B623DA6
4 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
backend/localcommand/factory.go
View file

@ -1,6 +1,7 @@
package localcommand
import (
"context"
"syscall"
"time"
@ -38,12 +39,12 @@ func (factory *Factory) Name() string {
return "local command"
}
func (factory *Factory) New(params map[string][]string, conn *websocket.Conn) (server.Slave, error) {
func (factory *Factory) New(ctx context.Context, params map[string][]string, conn *websocket.Conn) (server.Slave, error) {
argv := make([]string, len(factory.argv))
copy(argv, factory.argv)
if params["arg"] != nil && len(params["arg"]) > 0 {
if len(params["arg"]) > 0 {
argv = append(argv, params["arg"]...)
}
return New(factory.command, argv, factory.opts...)
return New(ctx, factory.command, argv, factory.opts...)
}

5
backend/localcommand/local_command.go
View file

@ -1,6 +1,7 @@
package localcommand
import (
"context"
"os"
"os/exec"
"syscall"
@ -28,8 +29,8 @@ type LocalCommand struct {
ptyClosed chan struct{}
}
func New(command string, argv []string, options ...Option) (*LocalCommand, error) {
cmd := exec.Command(command, argv...)
func New(ctx context.Context, command string, argv []string, options ...Option) (*LocalCommand, error) {
cmd := exec.CommandContext(ctx, command, argv...)
pty, err := pty.Start(cmd)
if err != nil {

4
server/handlers.go
View file

@ -72,7 +72,7 @@ func (server *Server) generateHandleWS(ctx context.Context, cancel context.Cance
}
defer conn.Close()
err = server.processWSConn(ctx, conn)
err = server.processWSConn(r.Context(), conn)
switch err {
case ctx.Err():
@ -117,7 +117,7 @@ func (server *Server) processWSConn(ctx context.Context, conn *websocket.Conn) e
params := query.Query()
var slave Slave
slave, err = server.factory.New(params, conn)
slave, err = server.factory.New(ctx, params, conn)
if err != nil {
return errors.Wrapf(err, "failed to create backend")
}

4
server/slave.go
View file

@ -1,6 +1,8 @@
package server
import (
"context"
"github.com/ghthor/gotty/v2/webtty"
"github.com/gorilla/websocket"
@ -15,5 +17,5 @@ type Slave interface {
type Factory interface {
Name() string
New(params map[string][]string, conn *websocket.Conn) (Slave, error)
New(ctx context.Context, params map[string][]string, conn *websocket.Conn) (Slave, error)
}