minimal ssh

This commit is contained in:
Adem Baccara
2025-08-19 09:42:09 +01:00
parent 215470279c
commit ce14e81140
13 changed files with 593 additions and 33 deletions
+36 -13
View File
@@ -16,7 +16,6 @@ package ui
import (
"fmt"
"github.com/Adembc/lazyssh/internal/core/domain"
"github.com/gdamore/tcell/v2"
"github.com/rivo/tview"
@@ -76,6 +75,7 @@ func (t *tui) handleSearchToggle() {
func (t *tui) handleServerConnect() {
if server, ok := t.serverList.GetSelectedServer(); ok {
t.showConnectModal(server)
}
}
@@ -114,8 +114,7 @@ func (t *tui) handleServerSave(server domain.Server, original *domain.Server) {
func (t *tui) handleServerDelete() {
if server, ok := t.serverList.GetSelectedServer(); ok {
_ = t.serverService.DeleteServer(server)
t.refreshServerList()
t.showDeleteConfirmModal(server)
}
}
@@ -144,13 +143,37 @@ func (t *tui) showSearchBar() {
}
func (t *tui) showConnectModal(server domain.Server) {
msg := fmt.Sprintf("SSH to %s (%s@%s:%d)\n\nThis is a mock action.",
msg := fmt.Sprintf("SSH to %s (%s@%s:%d)\n\nConfirm to start an SSH session .",
server.Alias, server.User, server.Host, server.Port)
modal := tview.NewModal().
SetText(msg).
AddButtons([]string{"OK"}).
AddButtons([]string{"Cancel", "Confirm"}).
SetDoneFunc(func(buttonIndex int, buttonLabel string) {
if buttonIndex == 1 {
// Suspend the TUI while running the external ssh command.
t.app.Suspend(func() {
_ = t.serverService.SSH(server.Alias)
})
}
t.handleModalClose()
})
t.app.SetRoot(modal, true)
}
func (t *tui) showDeleteConfirmModal(server domain.Server) {
msg := fmt.Sprintf("Delete server %s (%s@%s:%d)?\n\nThis action cannot be undone.",
server.Alias, server.User, server.Host, server.Port)
modal := tview.NewModal().
SetText(msg).
AddButtons([]string{"Cancel", "Confirm"}).
SetDoneFunc(func(buttonIndex int, buttonLabel string) {
if buttonIndex == 1 {
_ = t.serverService.DeleteServer(server)
t.refreshServerList()
}
t.handleModalClose()
})
@@ -159,14 +182,14 @@ func (t *tui) showConnectModal(server domain.Server) {
func (t *tui) showHelpModal() {
text := "Keyboard shortcuts:\n\n" +
" ↑/↓ Navigate\n" +
" Enter SSH connect (mock)\n" +
" a Add server (mock)\n" +
" e Edit server (mock)\n" +
" d Delete entry (mock)\n" +
" / Focus search\n" +
" q Quit\n" +
" ? Help\n"
" ↑/↓ Navigate\n" +
" Enter SSH connect \n" +
" a Add server \n" +
" e Edit server \n" +
" d Delete entry \n" +
" / Focus search\n" +
"q Quit\n" +
"? Help\n"
modal := tview.NewModal().
SetText(text).
+12 -4
View File
@@ -16,7 +16,6 @@ package ui
import (
"fmt"
"github.com/Adembc/lazyssh/internal/core/domain"
"github.com/gdamore/tcell/v2"
"github.com/rivo/tview"
@@ -44,11 +43,20 @@ func (sd *ServerDetails) build() {
}
func (sd *ServerDetails) UpdateServer(server domain.Server) {
lastSeen := server.LastSeen.Format("2006-01-02 15:04:05")
if server.LastSeen.IsZero() {
lastSeen = "Never"
}
serverKey := server.Key
if serverKey == "" {
serverKey = "(default: ~/.ssh/id_{rsa,ed25519,ecdsa})"
}
text := fmt.Sprintf(
"[::b]%s[-]\n\nHost: [white]%s[-]\nUser: [white]%s[-]\nPort: [white]%d[-]\nKey: [white]%s[-]\nTags: [white]%s[-]\nStatus: %s\nLast: %s\n\n[::b]Commands:[-]\n Enter: SSH connect\n a: Add new server\n e: Edit entry\n d: Delete entry",
"[::b]%s[-]\n\nHost: [white]%s[-]\nUser: [white]%s[-]\nPort: [white]%d[-]\nKey: [white]%s[-]\nTags: [white]%s[-]\nStatus: %s\nLast SSH: %s\n\n[::b]Commands:[-]\n Enter: SSH connect\n a: Add new server\n e: Edit entry\n d: Delete entry",
server.Alias, server.Host, server.User, server.Port,
server.Key, joinTags(server.Tags), statusIcon(server.Status),
server.LastSeen.Format("2006-01-02 15:04"))
serverKey, joinTags(server.Tags), statusIcon(server.Status),
lastSeen)
sd.TextView.SetText(text)
}
+17 -3
View File
@@ -17,12 +17,16 @@ package ui
import (
"time"
"go.uber.org/zap"
"github.com/Adembc/lazyssh/internal/core/ports"
"github.com/gdamore/tcell/v2"
"github.com/rivo/tview"
)
type tui struct {
logger *zap.SugaredLogger
version string
commit string
buildDate string
@@ -44,8 +48,9 @@ type tui struct {
searchVisible bool
}
func NewTUI(ss ports.ServerService, version, commit, buildDate string) *tui {
func NewTUI(logger *zap.SugaredLogger, ss ports.ServerService, version, commit, buildDate string) *tui {
return &tui{
logger: logger,
app: tview.NewApplication(),
serverService: ss,
version: version,
@@ -55,10 +60,19 @@ func NewTUI(ss ports.ServerService, version, commit, buildDate string) *tui {
}
func (t *tui) Run() error {
defer func() {
if r := recover(); r != nil {
t.logger.Errorw("panic recovered", "error", r)
}
}()
t.app.EnableMouse(true)
t.initializeTheme().buildComponents().buildLayout().bindEvents().loadInitialData().loadSplashScreen()
return t.app.Run()
t.logger.Infow("starting TUI application", "version", t.version, "commit", t.commit, "buildDate", t.buildDate)
if err := t.app.Run(); err != nil {
t.logger.Errorw("application run error", "error", err)
return err
}
return nil
}
func (t *tui) initializeTheme() *tui {
+6 -2
View File
@@ -54,12 +54,16 @@ func formatServerLine(s domain.Server) (primary, secondary string) {
case "offline":
statusColor = "red"
}
primary = fmt.Sprintf("%s [%s::b]%-12s[-] [#AAAAAA]%-18s[-] [#888888]Last:%s[-]", icon, statusColor, s.Alias, s.Host, humanizeDuration(time.Since(s.LastSeen)))
primary = fmt.Sprintf("%s [%s::b]%-12s[-] [#AAAAAA]%-18s[-] [#888888]Last SSH: %s[-]", icon, statusColor, s.Alias, s.Host, humanizeDuration(s.LastSeen))
secondary = ""
return
}
func humanizeDuration(d time.Duration) string {
func humanizeDuration(t time.Time) string {
if t.IsZero() {
return "never"
}
d := time.Since(t)
if d < time.Minute {
return "just now"
}