feat: use real pty

bubbletea/tea.go

@@ -4,6 +4,7 @@ package bubbletea
 import (
  "context"
 
+ "github.com/aymanbagabas/go-pty"
  tea "github.com/charmbracelet/bubbletea"
  "github.com/charmbracelet/lipgloss"
  "github.com/charmbracelet/log"
@@ -51,12 +52,33 @@ func MiddlewareWithColorProfile(bth Handler, cp termenv.Profile) wish.Middleware
  if m == nil {
  return nil
  }
- opts = append(opts, tea.WithInput(s), tea.WithOutput(s))
- return tea.NewProgram(m, opts...)
+ return tea.NewProgram(m, append(opts, makeIOOpts(s)...)...)
  }
  return MiddlewareWithProgramHandler(h, cp)
 }
 
+func makeIOOpts(s ssh.Session) []tea.ProgramOption {
+ noPtyOpts := []tea.ProgramOption{
+ tea.WithInput(s),
+ tea.WithOutput(s),
+ }
+
+ tty, _, ok := s.Pty()
+ if !ok {
+ return noPtyOpts
+ }
+
+ upty, ok := tty.Pty.(pty.UnixPty)
+ if !ok {
+ return noPtyOpts
+ }
+ f := upty.Slave()
+ return []tea.ProgramOption{
+ tea.WithInput(f),
+ tea.WithOutput(f),
+ }
+}
+
 // MiddlewareWithProgramHandler allows you to specify the ProgramHandler to be
 // able to access the underlying tea.Program. This is useful for creating custom
 // middlewars that need access to tea.Program for instance to use p.Send() to

examples/.gitignore

@@ -0,0 +1,2 @@
+id_ed25519*
+file.txt

examples/go.mod

@@ -6,8 +6,8 @@ require (
  github.com/charmbracelet/bubbles v0.16.1
  github.com/charmbracelet/bubbletea v0.24.2
  github.com/charmbracelet/lipgloss v0.9.1
- github.com/charmbracelet/log v0.2.5
- github.com/charmbracelet/ssh v0.0.0-20221117183211-483d43d97103
+ github.com/charmbracelet/log v0.3.1
+ github.com/charmbracelet/ssh v0.0.0-20231203183338-c29875a2932c
  github.com/charmbracelet/wish v0.5.0
  github.com/muesli/termenv v0.15.2
  github.com/spf13/cobra v1.7.0
@@ -17,18 +17,20 @@ require (
  dario.cat/mergo v1.0.0 // indirect
  github.com/Microsoft/go-winio v0.6.1 // indirect
  github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 // indirect
- github.com/acomagu/bufpipe v1.0.4 // indirect
  github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be // indirect
  github.com/atotto/clipboard v0.1.4 // indirect
  github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
+ github.com/aymanbagabas/go-pty v0.2.1 // indirect
  github.com/charmbracelet/keygen v0.5.0 // indirect
  github.com/cloudflare/circl v1.3.3 // indirect
  github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81 // indirect
+ github.com/creack/pty v1.1.15 // indirect
  github.com/cyphar/filepath-securejoin v0.2.4 // indirect
  github.com/emirpasic/gods v1.18.1 // indirect
+ github.com/gliderlabs/ssh v0.3.5 // indirect
  github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
  github.com/go-git/go-billy/v5 v5.5.0 // indirect
- github.com/go-git/go-git/v5 v5.10.0 // indirect
+ github.com/go-git/go-git/v5 v5.10.1 // indirect
  github.com/go-logfmt/logfmt v0.6.0 // indirect
  github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
  github.com/inconshreveable/mousetrap v1.1.0 // indirect
@@ -44,18 +46,18 @@ require (
  github.com/pjbgf/sha1cd v0.3.0 // indirect
  github.com/rivo/uniseg v0.2.0 // indirect
  github.com/sergi/go-diff v1.1.0 // indirect
- github.com/skeema/knownhosts v1.2.0 // indirect
+ github.com/skeema/knownhosts v1.2.1 // indirect
  github.com/spf13/pflag v1.0.5 // indirect
+ github.com/u-root/u-root v0.11.0 // indirect
  github.com/xanzy/ssh-agent v0.3.3 // indirect
- golang.org/x/crypto v0.14.0 // indirect
- golang.org/x/mod v0.12.0 // indirect
- golang.org/x/net v0.17.0 // indirect
- golang.org/x/sync v0.4.0 // indirect
- golang.org/x/sys v0.13.0 // indirect
- golang.org/x/term v0.13.0 // indirect
- golang.org/x/text v0.13.0 // indirect
- golang.org/x/tools v0.13.0 // indirect
+ golang.org/x/crypto v0.16.0 // indirect
+ golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
+ golang.org/x/mod v0.13.0 // indirect
+ golang.org/x/net v0.18.0 // indirect
+ golang.org/x/sync v0.5.0 // indirect
+ golang.org/x/sys v0.15.0 // indirect
+ golang.org/x/term v0.15.0 // indirect
+ golang.org/x/text v0.14.0 // indirect
+ golang.org/x/tools v0.14.0 // indirect
  gopkg.in/warnings.v0 v0.1.2 // indirect
 )
-
-replace github.com/charmbracelet/wish => ../