refactor: dedupe termsize-to-pty winsize conversion

Author: zouyonghe

pkg/jobmanager/jobcmd.go

@@ -13,6 +13,7 @@ import (
 	"time"
 
 	"github.com/creack/pty"
+	"github.com/wavetermdev/waveterm/pkg/util/ptyutil"
 	"github.com/wavetermdev/waveterm/pkg/util/unixutil"
 	"github.com/wavetermdev/waveterm/pkg/waveobj"
 	"github.com/wavetermdev/waveterm/pkg/wshrpc"
@@ -41,27 +42,6 @@ type JobCmd struct {
 	exitTs        int64
 }
 
-const maxUint16 = int(^uint16(0))
-
-func toWinsizeDimension(v int) uint16 {
-	if v <= 0 {
-		return 0
-	}
-	if v > maxUint16 {
-		return uint16(maxUint16)
-	}
-	return uint16(v)
-}
-
-func winsizeFromTermSize(termSize waveobj.TermSize) *pty.Winsize {
-	return &pty.Winsize{
-		Rows: toWinsizeDimension(termSize.Rows),
-		Cols: toWinsizeDimension(termSize.Cols),
-		X:    toWinsizeDimension(termSize.XPixel),
-		Y:    toWinsizeDimension(termSize.YPixel),
-	}
-}
-
 func MakeJobCmd(jobId string, cmdDef CmdDef) (*JobCmd, error) {
 	jm := &JobCmd{
 		jobId: jobId,
@@ -80,7 +60,7 @@ func MakeJobCmd(jobId string, cmdDef CmdDef) (*JobCmd, error) {
 			ecmd.Env = append(ecmd.Env, fmt.Sprintf("%s=%s", key, val))
 		}
 	}
-	cmdPty, err := pty.StartWithSize(ecmd, winsizeFromTermSize(cmdDef.TermSize))
+	cmdPty, err := pty.StartWithSize(ecmd, ptyutil.WinsizeFromTermSize(cmdDef.TermSize))
 	if err != nil {
 		return nil, fmt.Errorf("failed to start command: %w", err)
 	}
@@ -183,7 +163,7 @@ func (jm *JobCmd) setTermSize_withlock(termSize waveobj.TermSize) error {
 		jm.termSize.YPixel == termSize.YPixel {
 		return nil
 	}
-	err := pty.Setsize(jm.cmdPty, winsizeFromTermSize(termSize))
+	err := pty.Setsize(jm.cmdPty, ptyutil.WinsizeFromTermSize(termSize))
 	if err != nil {
 		return fmt.Errorf("error setting terminal size: %w", err)
 	}

pkg/shellexec/conninterface.go

@@ -14,6 +14,7 @@ import (
 
 	"github.com/creack/pty"
 	"github.com/wavetermdev/waveterm/pkg/panichandler"
+	"github.com/wavetermdev/waveterm/pkg/util/ptyutil"
 	"github.com/wavetermdev/waveterm/pkg/util/unixutil"
 	"github.com/wavetermdev/waveterm/pkg/waveobj"
 	"github.com/wavetermdev/waveterm/pkg/wsl"
@@ -135,7 +136,7 @@ func (cw CmdWrap) StderrPipe() (io.ReadCloser, error) {
 }
 
 func (cw CmdWrap) SetSize(termSize waveobj.TermSize) error {
-	err := pty.Setsize(cw.Pty, winsizeFromTermSize(termSize))
+	err := pty.Setsize(cw.Pty, ptyutil.WinsizeFromTermSize(termSize))
 	if err != nil {
 		return err
 	}

pkg/shellexec/shellexec.go

@@ -25,6 +25,7 @@ import (
 	"github.com/wavetermdev/waveterm/pkg/panichandler"
 	"github.com/wavetermdev/waveterm/pkg/remote/conncontroller"
 	"github.com/wavetermdev/waveterm/pkg/util/pamparse"
+	"github.com/wavetermdev/waveterm/pkg/util/ptyutil"
 	"github.com/wavetermdev/waveterm/pkg/util/shellutil"
 	"github.com/wavetermdev/waveterm/pkg/wavebase"
 	"github.com/wavetermdev/waveterm/pkg/waveobj"
@@ -54,27 +55,6 @@ type ShellProc struct {
 	WaitErr   error    // WaitErr is synchronized by DoneCh (written before DoneCh is closed) and CloseOnce
 }
 
-const maxUint16 = int(^uint16(0))
-
-func toWinsizeDimension(v int) uint16 {
-	if v <= 0 {
-		return 0
-	}
-	if v > maxUint16 {
-		return uint16(maxUint16)
-	}
-	return uint16(v)
-}
-
-func winsizeFromTermSize(termSize waveobj.TermSize) *pty.Winsize {
-	return &pty.Winsize{
-		Rows: toWinsizeDimension(termSize.Rows),
-		Cols: toWinsizeDimension(termSize.Cols),
-		X:    toWinsizeDimension(termSize.XPixel),
-		Y:    toWinsizeDimension(termSize.YPixel),
-	}
-}
-
 func (sp *ShellProc) Close() {
 	sp.Cmd.KillGraceful(DefaultGracefulKillWait)
 	go func() {
@@ -186,7 +166,7 @@ func StartWslShellProcNoWsh(ctx context.Context, termSize waveobj.TermSize, cmdS
 	if termSize.Rows <= 0 || termSize.Cols <= 0 {
 		return nil, fmt.Errorf("invalid term size: %v", termSize)
 	}
-	cmdPty, err := pty.StartWithSize(ecmd, winsizeFromTermSize(termSize))
+	cmdPty, err := pty.StartWithSize(ecmd, ptyutil.WinsizeFromTermSize(termSize))
 	if err != nil {
 		return nil, err
 	}
@@ -304,7 +284,7 @@ func StartWslShellProc(ctx context.Context, termSize waveobj.TermSize, cmdStr st
 		return nil, fmt.Errorf("invalid term size: %v", termSize)
 	}
 	shellutil.AddTokenSwapEntry(cmdOpts.SwapToken)
-	cmdPty, err := pty.StartWithSize(ecmd, winsizeFromTermSize(termSize))
+	cmdPty, err := pty.StartWithSize(ecmd, ptyutil.WinsizeFromTermSize(termSize))
 	if err != nil {
 		return nil, err
 	}
@@ -705,7 +685,7 @@ func StartLocalShellProc(logCtx context.Context, termSize waveobj.TermSize, cmdS
 		return nil, fmt.Errorf("invalid term size: %v", termSize)
 	}
 	shellutil.AddTokenSwapEntry(cmdOpts.SwapToken)
-	cmdPty, err := pty.StartWithSize(ecmd, winsizeFromTermSize(termSize))
+	cmdPty, err := pty.StartWithSize(ecmd, ptyutil.WinsizeFromTermSize(termSize))
 	if err != nil {
 		return nil, err
 	}
@@ -723,7 +703,7 @@ func RunSimpleCmdInPty(ecmd *exec.Cmd, termSize waveobj.TermSize) ([]byte, error
 	if termSize.Rows <= 0 || termSize.Cols <= 0 {
 		return nil, fmt.Errorf("invalid term size: %v", termSize)
 	}
-	cmdPty, err := pty.StartWithSize(ecmd, winsizeFromTermSize(termSize))
+	cmdPty, err := pty.StartWithSize(ecmd, ptyutil.WinsizeFromTermSize(termSize))
 	if err != nil {
 		cmdPty.Close()
 		return nil, err

pkg/util/ptyutil/ptyutil.go

@@ -0,0 +1,30 @@
+// Copyright 2025, Command Line Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+package ptyutil
+
+import (
+	"github.com/creack/pty"
+	"github.com/wavetermdev/waveterm/pkg/waveobj"
+)
+
+const maxUint16 = int(^uint16(0))
+
+func toWinsizeDimension(v int) uint16 {
+	if v <= 0 {
+		return 0
+	}
+	if v > maxUint16 {
+		return uint16(maxUint16)
+	}
+	return uint16(v)
+}
+
+func WinsizeFromTermSize(termSize waveobj.TermSize) *pty.Winsize {
+	return &pty.Winsize{
+		Rows: toWinsizeDimension(termSize.Rows),
+		Cols: toWinsizeDimension(termSize.Cols),
+		X:    toWinsizeDimension(termSize.XPixel),
+		Y:    toWinsizeDimension(termSize.YPixel),
+	}
+}