diff --git a/cmd/main.go b/cmd/main.go index 777e339..f4539a2 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -17,9 +17,13 @@ package main import ( "fmt" "os" + "path/filepath" "time" - "github.com/Adembc/lazyssh/internal/adapters/data/memory" + "github.com/Adembc/lazyssh/internal/adapters/data/file" + + "github.com/Adembc/lazyssh/internal/logger" + "github.com/Adembc/lazyssh/internal/adapters/ui" "github.com/Adembc/lazyssh/internal/core/services" "github.com/spf13/cobra" @@ -32,9 +36,25 @@ var ( ) func main() { - serverInMemoryRepo := memory.NewServerRepository() - serverService := services.NewServerService(serverInMemoryRepo) - tui := ui.NewTUI(serverService, version, gitCommit, buildTime) + log, err := logger.New("LAZYSSH") + if err != nil { + fmt.Println(err) + os.Exit(1) + } + defer log.Sync() + + home, err := os.UserHomeDir() + if err != nil { + log.Errorw("failed to get user home directory", "error", err) + os.Exit(1) + } + sshConfigFile := filepath.Join(home, ".ssh", "config") + metaDataFile := filepath.Join(home, ".lazyssh", "metadata.json") + + serverRepo := file.NewServerRepo(log, sshConfigFile, metaDataFile) + // serverInMemoryRepo := memory.NewServerRepository(log) + serverService := services.NewServerService(log, serverRepo) + tui := ui.NewTUI(log, serverService, version, gitCommit, buildTime) rootCmd := &cobra.Command{ Use: ui.AppName, diff --git a/go.mod b/go.mod index 6aef415..2fd14e2 100644 --- a/go.mod +++ b/go.mod @@ -6,6 +6,7 @@ require ( github.com/gdamore/tcell/v2 v2.8.1 github.com/rivo/tview v0.0.0-20250625164341-a4a78f1e05cb github.com/spf13/cobra v1.9.1 + go.uber.org/zap v1.27.0 ) require ( @@ -15,6 +16,7 @@ require ( github.com/mattn/go-runewidth v0.0.16 // indirect github.com/rivo/uniseg v0.4.7 // indirect github.com/spf13/pflag v1.0.7 // indirect + go.uber.org/multierr v1.10.0 // indirect golang.org/x/sys v0.35.0 // indirect golang.org/x/term v0.34.0 // indirect golang.org/x/text v0.28.0 // indirect diff --git a/go.sum b/go.sum index 411851a..bed85cd 100644 --- a/go.sum +++ b/go.sum @@ -1,4 +1,6 @@ github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/gdamore/encoding v1.0.1 h1:YzKZckdBL6jVt2Gc+5p82qhrGiqMdG/eNs6Wy0u3Uhw= github.com/gdamore/encoding v1.0.1/go.mod h1:0Z0cMFinngz9kS1QfMjCP8TY7em3bZYeeklsSDPivEo= github.com/gdamore/tcell/v2 v2.8.1 h1:KPNxyqclpWpWQlPLx6Xui1pMk8S+7+R37h3g07997NU= @@ -10,6 +12,8 @@ github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69 github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0= github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc= github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/rivo/tview v0.0.0-20250625164341-a4a78f1e05cb h1:n7UJ8X9UnrTZBYXnd1kAIBc067SWyuPIrsocjketYW8= github.com/rivo/tview v0.0.0-20250625164341-a4a78f1e05cb/go.mod h1:cSfIYfhpSGCjp3r/ECJb+GKS7cGJnqV8vfjQPwoXyfY= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= @@ -22,7 +26,15 @@ github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wx github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/pflag v1.0.7 h1:vN6T9TfwStFPFM5XzjsvmzZkLuaLX+HS+0SeFLRgU6M= github.com/spf13/pflag v1.0.7/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= +go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= +go.uber.org/multierr v1.10.0 h1:S0h4aNzvfcFsC3dRF1jLoaov7oRaKqRGC/pUEJ2yvPQ= +go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= +go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= +go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= @@ -91,4 +103,5 @@ golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58 golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/internal/adapters/data/file/server_file_repo.go b/internal/adapters/data/file/server_file_repo.go new file mode 100644 index 0000000..7086b60 --- /dev/null +++ b/internal/adapters/data/file/server_file_repo.go @@ -0,0 +1,365 @@ +// Copyright 2025. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package file + +import ( + "bufio" + "encoding/json" + "fmt" + "os" + "path/filepath" + "strconv" + "strings" + "time" + + "go.uber.org/zap" + + "github.com/Adembc/lazyssh/internal/core/domain" +) + +const ( + ManagedByComment = "# Managed by lazyssh" + DefaultPort = 22 +) + +type ServerMetadata struct { + Tags []string `json:"tags,omitempty"` + LastSeen string `json:"last_seen,omitempty"` + Favorite bool `json:"favorite,omitempty"` + Notes string `json:"notes,omitempty"` +} + +type serverRepo struct { + sshConfigFilePath string + metaDataFilePath string + logger *zap.SugaredLogger +} + +func NewServerRepo(logger *zap.SugaredLogger, sshPath, metaDataPath string) *serverRepo { + return &serverRepo{logger: logger, sshConfigFilePath: sshPath, metaDataFilePath: metaDataPath} +} + +func (s serverRepo) ListServers(query string) ([]domain.Server, error) { + servers, err := s.parseSSHConfig() + if err != nil { + return nil, fmt.Errorf("failed to parse SSH config: %w", err) + } + + metadata, err := s.loadMetadata() + if err != nil { + // Log error but continue without metadata + metadata = make(map[string]ServerMetadata) + } + + // Merge metadata with servers + for i, server := range servers { + servers[i].Status = "online" + servers[i].LastSeen = time.Time{} + + if meta, exists := metadata[server.Alias]; exists { + servers[i].Tags = meta.Tags + if meta.LastSeen != "" { + if lastSeen, err := time.Parse(time.RFC3339, meta.LastSeen); err == nil { + servers[i].LastSeen = lastSeen + } + } + } + } + + // Filter by query if provided + if query != "" { + filtered := make([]domain.Server, 0) + queryLower := strings.ToLower(query) + for _, server := range servers { + if strings.Contains(strings.ToLower(server.Alias), queryLower) || + strings.Contains(strings.ToLower(server.Host), queryLower) || + strings.Contains(strings.ToLower(server.User), queryLower) { + filtered = append(filtered, server) + } + } + return filtered, nil + } + + return servers, nil +} + +func (s serverRepo) UpdateServer(server domain.Server, newServer domain.Server) error { + servers, err := s.parseSSHConfig() + if err != nil { + return fmt.Errorf("failed to parse SSH config: %w", err) + } + + // Find and update the server + found := false + for i, srv := range servers { + if srv.Alias == server.Alias { + servers[i] = newServer + found = true + break + } + } + + if !found { + return fmt.Errorf("server with alias '%s' not found", server.Alias) + } + + // Write back to SSH config + if err := s.writeSSHConfig(servers); err != nil { + return fmt.Errorf("failed to write SSH config: %w", err) + } + + // Update metadata + return s.updateMetadata(newServer) +} + +func (s serverRepo) AddServer(server domain.Server) error { + servers, err := s.parseSSHConfig() + if err != nil && !os.IsNotExist(err) { + return fmt.Errorf("failed to parse SSH config: %w", err) + } + + // Check if server already exists + for _, srv := range servers { + if srv.Alias == server.Alias { + return fmt.Errorf("server with alias '%s' already exists", server.Alias) + } + } + + // Add new server + servers = append(servers, server) + + // Write to SSH config + if err := s.writeSSHConfig(servers); err != nil { + return fmt.Errorf("failed to write SSH config: %w", err) + } + + // Update metadata + return s.updateMetadata(server) +} + +func (s serverRepo) DeleteServer(server domain.Server) error { + servers, err := s.parseSSHConfig() + if err != nil { + return fmt.Errorf("failed to parse SSH config: %w", err) + } + + // Find and remove the server + found := false + newServers := make([]domain.Server, 0, len(servers)) + for _, srv := range servers { + if srv.Alias != server.Alias { + newServers = append(newServers, srv) + } else { + found = true + } + } + + if !found { + return fmt.Errorf("server with alias '%s' not found", server.Alias) + } + + // Write back to SSH config + if err := s.writeSSHConfig(newServers); err != nil { + return fmt.Errorf("failed to write SSH config: %w", err) + } + + // Remove from metadata + return s.removeFromMetadata(server.Alias) +} + +func (s serverRepo) parseSSHConfig() ([]domain.Server, error) { + file, err := os.Open(s.sshConfigFilePath) + if err != nil { + + if os.IsNotExist(err) { + return []domain.Server{}, nil + } + return nil, err + } + defer file.Close() + + var servers []domain.Server + var currentServer *domain.Server + scanner := bufio.NewScanner(file) + for scanner.Scan() { + line := strings.TrimSpace(scanner.Text()) + + // Skip empty lines and comments + if line == "" || strings.HasPrefix(line, "#") { + continue + } + + // Split key-value pairs + parts := strings.Fields(line) + if len(parts) < 2 { + continue + } + + key := strings.ToLower(parts[0]) + value := strings.Join(parts[1:], " ") + + switch key { + case "host": + // Save previous server if exists + if currentServer != nil { + servers = append(servers, *currentServer) + } + // Start new server + currentServer = &domain.Server{ + Alias: value, + Port: DefaultPort, // Default SSH port + } + case "hostname": + if currentServer != nil { + currentServer.Host = value + } + case "user": + if currentServer != nil { + currentServer.User = value + } + case "port": + if currentServer != nil { + if port, err := strconv.Atoi(value); err == nil { + currentServer.Port = port + } + } + case "identityfile": + if currentServer != nil { + // Expand ~ to home directory + if strings.HasPrefix(value, "~/") { + if home, err := os.UserHomeDir(); err == nil { + value = filepath.Join(home, value[2:]) + } + } + currentServer.Key = value + } + } + } + + if currentServer != nil { + + servers = append(servers, *currentServer) + } + + return servers, scanner.Err() +} + +func (s serverRepo) writeSSHConfig(servers []domain.Server) error { + // Create directory if it doesn't exist + dir := filepath.Dir(s.sshConfigFilePath) + if err := os.MkdirAll(dir, 0o700); err != nil { + return err + } + + file, err := os.Create(s.sshConfigFilePath) + if err != nil { + return err + } + defer file.Close() + + writer := bufio.NewWriter(file) + defer writer.Flush() + + for i, server := range servers { + if i > 0 { + writer.WriteString("\n") + } + + fmt.Fprintf(writer, "%s\n", ManagedByComment) + fmt.Fprintf(writer, "Host %s\n", server.Alias) + + if server.Host != "" { + fmt.Fprintf(writer, " HostName %s\n", server.Host) + } + + if server.User != "" { + fmt.Fprintf(writer, " User %s\n", server.User) + } + + if server.Port != 0 && server.Port != DefaultPort { + fmt.Fprintf(writer, " Port %d\n", server.Port) + } + + if server.Key != "" { + fmt.Fprintf(writer, " IdentityFile %s\n", server.Key) + } + } + + return nil +} + +func (s serverRepo) loadMetadata() (map[string]ServerMetadata, error) { + metadata := make(map[string]ServerMetadata) + + if _, err := os.Stat(s.metaDataFilePath); os.IsNotExist(err) { + return metadata, nil + } + + data, err := os.ReadFile(s.metaDataFilePath) + if err != nil { + return nil, err + } + + if len(data) == 0 { + return metadata, nil + } + + if err := json.Unmarshal(data, &metadata); err != nil { + return nil, fmt.Errorf("failed to parse metadata JSON: %w", err) + } + + return metadata, nil +} + +func (s serverRepo) updateMetadata(server domain.Server) error { + metadata, err := s.loadMetadata() + if err != nil { + metadata = make(map[string]ServerMetadata) + } + + serverMeta := ServerMetadata{ + Tags: server.Tags, + LastSeen: server.LastSeen.Format(time.RFC3339), + } + + metadata[server.Alias] = serverMeta + + return s.saveMetadata(metadata) +} + +func (s serverRepo) removeFromMetadata(alias string) error { + metadata, err := s.loadMetadata() + if err != nil { + return nil // If we can't load metadata, there's nothing to remove + } + + delete(metadata, alias) + return s.saveMetadata(metadata) +} + +func (s serverRepo) saveMetadata(metadata map[string]ServerMetadata) error { + // Create directory if it doesn't exist + dir := filepath.Dir(s.metaDataFilePath) + if err := os.MkdirAll(dir, 0o750); err != nil { + return err + } + + data, err := json.MarshalIndent(metadata, "", " ") + if err != nil { + return err + } + + return os.WriteFile(s.metaDataFilePath, data, 0o600) +} diff --git a/internal/adapters/data/memory/server_repo.go b/internal/adapters/data/memory/server_in_memory_repo.go similarity index 95% rename from internal/adapters/data/memory/server_repo.go rename to internal/adapters/data/memory/server_in_memory_repo.go index a830cb1..20690e9 100644 --- a/internal/adapters/data/memory/server_repo.go +++ b/internal/adapters/data/memory/server_in_memory_repo.go @@ -19,10 +19,14 @@ import ( "strings" "time" + "go.uber.org/zap" + "github.com/Adembc/lazyssh/internal/core/domain" ) -type serverRepository struct{} +type serverRepository struct { + logger *zap.SugaredLogger +} var servers = []domain.Server{ {Alias: "web-01", Host: "192.168.1.10", User: "root", Port: 22, Key: "~/.ssh/id_rsa", Tags: []string{"prod", "web"}, Status: "online", LastSeen: time.Now().Add(-2 * time.Hour)}, @@ -36,8 +40,10 @@ var servers = []domain.Server{ } // NewServerRepository creates a new server repository with the given file path. -func NewServerRepository() *serverRepository { - return &serverRepository{} +func NewServerRepository(logger *zap.SugaredLogger) *serverRepository { + return &serverRepository{ + logger: logger, + } } // ListServers returns a list of servers from the repository. diff --git a/internal/adapters/ui/handlers.go b/internal/adapters/ui/handlers.go index 69324c0..479ff9e 100644 --- a/internal/adapters/ui/handlers.go +++ b/internal/adapters/ui/handlers.go @@ -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). diff --git a/internal/adapters/ui/server_details.go b/internal/adapters/ui/server_details.go index 856a65c..13f89f9 100644 --- a/internal/adapters/ui/server_details.go +++ b/internal/adapters/ui/server_details.go @@ -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) } diff --git a/internal/adapters/ui/tui.go b/internal/adapters/ui/tui.go index e282cf7..1bad297 100644 --- a/internal/adapters/ui/tui.go +++ b/internal/adapters/ui/tui.go @@ -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 { diff --git a/internal/adapters/ui/utils.go b/internal/adapters/ui/utils.go index 39b1bf0..ad465ce 100644 --- a/internal/adapters/ui/utils.go +++ b/internal/adapters/ui/utils.go @@ -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" } diff --git a/internal/core/ports/services.go b/internal/core/ports/services.go index c2bb7ac..fc55d8a 100644 --- a/internal/core/ports/services.go +++ b/internal/core/ports/services.go @@ -21,4 +21,5 @@ type ServerService interface { UpdateServer(server domain.Server, newServer domain.Server) error AddServer(server domain.Server) error DeleteServer(server domain.Server) error + SSH(alias string) error } diff --git a/internal/core/services/server_service.go b/internal/core/services/server_service.go index 2fcc71c..878b5c8 100644 --- a/internal/core/services/server_service.go +++ b/internal/core/services/server_service.go @@ -15,17 +15,23 @@ package services import ( + "os" + "os/exec" + "github.com/Adembc/lazyssh/internal/core/domain" "github.com/Adembc/lazyssh/internal/core/ports" + "go.uber.org/zap" ) type serverService struct { serverRepository ports.ServerRepository + logger *zap.SugaredLogger } // NewServerService creates a new instance of serverService. -func NewServerService(sr ports.ServerRepository) *serverService { +func NewServerService(logger *zap.SugaredLogger, sr ports.ServerRepository) *serverService { return &serverService{ + logger: logger, serverRepository: sr, } } @@ -35,22 +41,51 @@ func (s *serverService) ListServers(query string) ([]domain.Server, error) { // do any relevant business logic here if needed servers, err := s.serverRepository.ListServers(query) if err != nil { + s.logger.Errorw("failed to list servers", "error", err) return nil, err } + return servers, nil } // UpdateServer updates an existing server with new details. func (s *serverService) UpdateServer(server domain.Server, newServer domain.Server) error { - return s.serverRepository.UpdateServer(server, newServer) + err := s.serverRepository.UpdateServer(server, newServer) + if err != nil { + s.logger.Errorw("failed to update server", "error", err, "server", server) + } + return err } // AddServer adds a new server to the repository. func (s *serverService) AddServer(server domain.Server) error { - return s.serverRepository.AddServer(server) + err := s.serverRepository.AddServer(server) + if err != nil { + s.logger.Errorw("failed to add server", "error", err, "server", server) + } + return err } // DeleteServer removes a server from the repository. func (s *serverService) DeleteServer(server domain.Server) error { - return s.serverRepository.DeleteServer(server) + err := s.serverRepository.DeleteServer(server) + if err != nil { + s.logger.Errorw("failed to delete server", "error", err, "server", server) + } + return err +} + +// SSH starts an interactive SSH session to the given alias using the system's ssh client. +func (s *serverService) SSH(alias string) error { + s.logger.Infow("ssh start", "alias", alias) + cmd := exec.Command("ssh", alias) + cmd.Stdin = os.Stdin + cmd.Stdout = os.Stdout + cmd.Stderr = os.Stderr + if err := cmd.Run(); err != nil { + s.logger.Errorw("ssh command failed", "alias", alias, "error", err) + return err + } + s.logger.Infow("ssh end", "alias", alias) + return nil } diff --git a/internal/logger/logger.go b/internal/logger/logger.go new file mode 100644 index 0000000..9e8a413 --- /dev/null +++ b/internal/logger/logger.go @@ -0,0 +1,58 @@ +// Copyright 2025. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package logger + +import ( + "os" + "path/filepath" + + "go.uber.org/zap" + "go.uber.org/zap/zapcore" +) + +// New constructs a Sugared Logger that writes to a file and +// provides human-readable timestamps. +func New(service string, outputPaths ...string) (*zap.SugaredLogger, error) { + config := zap.NewProductionConfig() + + config.EncoderConfig.EncodeTime = zapcore.ISO8601TimeEncoder + config.Level = zap.NewAtomicLevelAt(zap.DebugLevel) + + config.DisableStacktrace = true + config.InitialFields = map[string]any{ + "service": service, + } + + home, err := os.UserHomeDir() + if err != nil { + return nil, err + } + logDir := filepath.Join(home, ".lazyssh") + if err := os.MkdirAll(logDir, 0o755); err != nil { + return nil, err + } + config.OutputPaths = []string{filepath.Join(logDir, "lazyssh.log")} + + if outputPaths != nil { + config.OutputPaths = outputPaths + } + + log, err := config.Build(zap.WithCaller(true)) + if err != nil { + return nil, err + } + + return log.Sugar(), nil +} diff --git a/~/.lazyssh/metadata.json b/~/.lazyssh/metadata.json new file mode 100644 index 0000000..e09629e --- /dev/null +++ b/~/.lazyssh/metadata.json @@ -0,0 +1,11 @@ +{ + "lissene": { + "tags": [ + "test" + ], + "last_seen": "2025-08-18T15:16:55+01:00" + }, + "smeet1": { + "last_seen": "0001-01-01T00:00:00Z" + } +} \ No newline at end of file