feat: add read timeout config

Author: zeromake

internal/command/cli.go

@@ -200,13 +200,12 @@ func (cli *DebugCli) PullImage(image string) error {
 	domain, remainder := splitDockerDomain(image)
 	imageName := path.Join(domain, remainder)
 
-	ctx, cancel := cli.withContent(cli.config.Timeout * 30)
+	ctx, cancel := context.WithCancel(cli.ctx)
 	defer cancel()
 	responseBody, err := cli.client.ImagePull(ctx, imageName, types.ImagePullOptions{})
 	if err != nil {
 		return errors.WithStack(err)
 	}
-
 	defer func() {
 		err = responseBody.Close()
 		if err != nil {
@@ -424,7 +423,7 @@ func (cli *DebugCli) ExecStart(_ execOptions, execID string) error {
 		Resp:         response,
 		TTY:          true,
 	}
-	return streamer.Stream(cli.ctx)
+	return streamer.Stream(cli.ctx, cli.config.ReadTimeout)
 }
 
 // FindContainer find container

internal/config/config.go

@@ -20,7 +20,7 @@ var configName = "config.toml"
 // PathSeparator path separator
 var PathSeparator = string(os.PathSeparator)
 
-// ConfigFile 默认配置文件
+// File 默认配置文件
 var File = fmt.Sprintf(
 	"~%s%s%s%s",
 	PathSeparator,
@@ -65,6 +65,7 @@ type Config struct {
 	Timeout             time.Duration            `toml:"timeout"`
 	DockerConfigDefault string                   `toml:"config_default"`
 	DockerConfig        map[string]*DockerConfig `toml:"config"`
+	ReadTimeout         time.Duration            `toml:"read_timeout"`
 }
 
 // Save save to default file
@@ -144,6 +145,7 @@ func InitConfig() (*Config, error) {
 		DockerConfig: map[string]*DockerConfig{
 			"default": &dc,
 		},
+		ReadTimeout: time.Second * 3,
 	}
 	file, err := os.OpenFile(File, os.O_CREATE|os.O_RDWR|os.O_TRUNC, 0644)
 	if err != nil {

internal/config/version-0.7.6.go

@@ -0,0 +1,25 @@
+package config
+
+import (
+	"github.com/blang/semver"
+	"time"
+)
+
+// Up000706 update version 0.7.6
+func Up000706(conf *Config) error {
+	if conf.ReadTimeout == 0 {
+		conf.ReadTimeout = time.Second * 3
+	}
+	return nil
+}
+
+func init() {
+	v, err := semver.Parse("0.7.6")
+	if err != nil {
+		return
+	}
+	migrationArr = append(migrationArr, &migration{
+		Up:      Up000706,
+		Version: v,
+	})
+}

pkg/tty/hijack.go

@@ -39,7 +39,7 @@ type HijackedIOStreamer struct {
 // to/from the hijacked connection, blocking until it is either done reading
 // output, the user inputs the detach key sequence when in TTY mode, or when
 // the given context is cancelled.
-func (h *HijackedIOStreamer) Stream(ctx context.Context) error {
+func (h *HijackedIOStreamer) Stream(ctx context.Context, readTimeout time.Duration) error {
 	restoreInput, err := h.setupInput()
 	if err != nil {
 		return errors.Errorf("unable to setup input stream: %s", err)
@@ -48,7 +48,7 @@ func (h *HijackedIOStreamer) Stream(ctx context.Context) error {
 	defer restoreInput()
 	defer h.Resp.Close()
 	outputDone := h.beginOutputStream(restoreInput)
-	inputDone, detached := h.beginInputStream(ctx, restoreInput)
+	inputDone, detached := h.beginInputStream(ctx, restoreInput, readTimeout)
 
 	select {
 	case err = <-outputDone:
@@ -145,7 +145,7 @@ func (h *HijackedIOStreamer) beginOutputStream(restoreInput func()) <-chan error
 
 var errInvalidWrite = errors.New("invalid write result")
 
-func Copy(ctx context.Context, dst net.Conn, src io.Reader) (written int64, err error) {
+func Copy(ctx context.Context, dst net.Conn, src io.Reader, readTimeout time.Duration) (written int64, err error) {
 	size := 32 * 1024
 	buf := make([]byte, size)
 	for {
@@ -158,7 +158,7 @@ func Copy(ctx context.Context, dst net.Conn, src io.Reader) (written int64, err
 		nr, er := src.Read(buf)
 		if nr > 0 {
 			// docker container is stop check
-			err = dst.SetReadDeadline(time.Now().Add(time.Second * 3))
+			err = dst.SetReadDeadline(time.Now().Add(readTimeout))
 			if err != nil {
 				break
 			}
@@ -189,13 +189,13 @@ func Copy(ctx context.Context, dst net.Conn, src io.Reader) (written int64, err
 	return
 }
 
-func (h *HijackedIOStreamer) beginInputStream(ctx context.Context, restoreInput func()) (doneC <-chan struct{}, detachedC <-chan error) {
+func (h *HijackedIOStreamer) beginInputStream(ctx context.Context, restoreInput func(), readTimeout time.Duration) (doneC <-chan struct{}, detachedC <-chan error) {
 	inputDone := make(chan struct{})
 	detached := make(chan error)
 
 	go func() {
 		if h.InputStream != nil {
-			_, err := Copy(ctx, h.Resp.Conn, h.InputStream)
+			_, err := Copy(ctx, h.Resp.Conn, h.InputStream, readTimeout)
 			restoreInput()
 
 			logrus.Debug("[hijack] End of stdin")