Feat/wish #33
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,125 @@ | ||
| package cmd | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "io" | ||
| "log" | ||
| "os" | ||
| "os/exec" | ||
| "os/signal" | ||
| "strings" | ||
| "syscall" | ||
| "time" | ||
|
|
||
| "github.com/creack/pty" | ||
| "github.com/dyne/tgcom/utils/server" | ||
| "github.com/spf13/cobra" | ||
| "golang.org/x/term" | ||
| ) | ||
|
|
||
| // serverCmd represents the server command | ||
| var serverCmd = &cobra.Command{ | ||
| Use: "server", | ||
| Short: "Start the SSH server", | ||
| Long: `Start the SSH server that allows remote interactions with tgcom.`, | ||
| Run: func(cmd *cobra.Command, args []string) { | ||
| server.StartServer() | ||
| }, | ||
| } | ||
|
|
||
| func init() { | ||
| // Register the server command | ||
| rootCmd.AddCommand(serverCmd) | ||
| } | ||
|
|
||
| func executeRemoteCommand(remotePath string) { | ||
| parts := strings.SplitN(remotePath, "@", 2) | ||
| if len(parts) != 2 { | ||
| fmt.Println("Invalid format. Usage: tgcom -w user@remote:/path/folder") | ||
| os.Exit(1) | ||
| } | ||
|
|
||
| userHost := parts[0] | ||
| pathParts := strings.SplitN(parts[1], ":", 2) | ||
| if len(pathParts) != 2 { | ||
| fmt.Println("Invalid format. Usage: tgcom -w user@remote:/path/folder") | ||
| os.Exit(1) | ||
| } | ||
|
|
||
| host := pathParts[0] | ||
| dir := pathParts[1] | ||
|
|
||
| sshCmd := "ssh" | ||
| sshArgs := []string{"-t", "-p", "2222", userHost + "@" + host, "tgcom", dir} | ||
|
|
||
| // Start SSH command with PTY | ||
| if err := startSSHWithPTY(sshCmd, sshArgs); err != nil { | ||
| log.Fatalf("Error starting SSH with PTY: %v", err) | ||
| } | ||
| } | ||
|
|
||
| func startSSHWithPTY(cmd string, args []string) error { | ||
| // Create SSH command | ||
| sshCommand := exec.Command(cmd, args...) | ||
|
|
||
| // Start PTY | ||
| ptmx, err := pty.Start(sshCommand) | ||
| if err != nil { | ||
| return fmt.Errorf("failed to start PTY: %w", err) | ||
| } | ||
| defer ptmx.Close() | ||
|
|
||
| // Set terminal attributes | ||
| oldState, err := term.MakeRaw(int(os.Stdin.Fd())) | ||
| if err != nil { | ||
| return fmt.Errorf("failed to make terminal raw: %w", err) | ||
| } | ||
| defer term.Restore(int(os.Stdin.Fd()), oldState) | ||
|
|
||
| // Resize PTY to current terminal size | ||
| if err := resizePTY(ptmx); err != nil { | ||
| return fmt.Errorf("failed to resize PTY: %w", err) | ||
| } | ||
|
|
||
| // Forward input to PTY | ||
| go func() { | ||
| _, _ = io.Copy(ptmx, os.Stdin) | ||
| }() | ||
|
|
||
| // Forward output from PTY | ||
| go func() { | ||
| _, _ = io.Copy(os.Stdout, ptmx) | ||
| }() | ||
|
|
||
| // Handle PTY signals and resize | ||
| go func() { | ||
| ch := make(chan os.Signal, 1) | ||
| signal.Notify(ch, syscall.SIGWINCH) | ||
| for range ch { | ||
| if err := resizePTY(ptmx); err != nil { | ||
| log.Printf("Error resizing PTY: %v", err) | ||
| } | ||
| } | ||
| }() | ||
|
|
||
| // Wait for SSH command to finish | ||
| if err := sshCommand.Wait(); err != nil { | ||
| return fmt.Errorf("SSH command failed: %w", err) | ||
| } | ||
|
|
||
| // Wait a bit before exiting to ensure all output is processed | ||
| time.Sleep(100 * time.Millisecond) | ||
|
|
||
| return nil | ||
| } | ||
|
Comment on lines
+35
to
+114
There was a problem hiding this comment. Review of SSH command execution functions: Enhance error handling and resource management.
Refactor the error handling to provide more detailed error messages and ensure resources are cleaned up even when errors occur. |
||
|
|
||
| func resizePTY(ptmx *os.File) error { | ||
| size, err := pty.GetsizeFull(os.Stdin) | ||
| if err != nil { | ||
| return fmt.Errorf("failed to get terminal size: %w", err) | ||
| } | ||
| if err := pty.Setsize(ptmx, size); err != nil { | ||
| return fmt.Errorf("failed to set terminal size: %w", err) | ||
| } | ||
| return nil | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Add a comment for the
clearScreenfunction.The
clearScreenfunction clears the terminal screen.+// clearScreen clears the terminal screen. func clearScreen() {Committable suggestion