Feat: separate main

cmd/start/start.go

@@ -0,0 +1,79 @@
+package start
+
+import (
+	"encoding/json"
+	"flag"
+	"fmt"
+	"io"
+	"os"
+	"runtime"
+
+	pty "github.com/MCSManager/pty/console"
+	"github.com/mattn/go-colorable"
+)
+
+var (
+	dir, cmd, coder, ptySize string
+	cmds                     []string
+	colorAble                bool
+)
+
+type PtyInfo struct {
+	Pid int `json:"pid"`
+}
+
+func init() {
+	if runtime.GOOS == "windows" {
+		flag.StringVar(&cmd, "cmd", "[\"cmd\"]", "command")
+	} else {
+		flag.StringVar(&cmd, "cmd", "[\"sh\"]", "command")
+	}
+
+	flag.BoolVar(&colorAble, "color", false, "colorable (default false)")
+	flag.StringVar(&coder, "coder", "UTF-8", "Coder")
+	flag.StringVar(&dir, "dir", ".", "command work path")
+	flag.StringVar(&ptySize, "size", "80,50", "Initialize pty size, stdin will be forwarded directly")
+}
+
+func Main() {
+	flag.Parse()
+	json.Unmarshal([]byte(cmd), &cmds)
+
+	con := pty.New(coder, colorAble)
+	if err := con.ResizeWithString(ptySize); err != nil {
+		fmt.Printf("[MCSMANAGER-PTY] PTY ReSize Error: %v\n", err)
+		return
+	}
+
+	err := con.Start(dir, cmds)
+	info, _ := json.Marshal(&PtyInfo{
+		Pid: con.Pid(),
+	})
+	fmt.Println(string(info))
+	if err != nil {
+		fmt.Printf("[MCSMANAGER-PTY] Process Start Error: %v\n", err)
+		return
+	}
+	defer con.Close()
+
+	HandleStdIO(con)
+	con.Wait()
+}
+
+func HandleStdIO(c pty.Console) {
+	go io.Copy(c.StdIn(), os.Stdin)
+	if runtime.GOOS == "windows" && c.StdErr() != nil {
+		go io.Copy(os.Stderr, c.StdErr())
+	}
+	handleStdOut(c)
+}
+
+func handleStdOut(c pty.Console) {
+	var stdout io.Writer
+	if colorAble {
+		stdout = colorable.NewColorable(os.Stdout)
+	} else {
+		stdout = colorable.NewNonColorable(os.Stdout)
+	}
+	io.Copy(stdout, c.StdOut())
+}

core/common.go → console/common.go

@@ -8,15 +8,15 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/MCSManager/pty/core/interfaces"
+	"github.com/MCSManager/pty/console/iface"
 )
 
 var (
 	ErrProcessNotStarted = errors.New("process has not been started")
 	ErrInvalidCmd        = errors.New("invalid command")
 )
 
-type Console interfaces.Console
+type Console iface.Console
 
 func New(coder string, colorAble bool) Console {
 	return newNative(coder, colorAble, 50, 50)

core/console.go → console/console.go

@@ -10,12 +10,11 @@ import (
 	"path/filepath"
 	"syscall"
 
+	"github.com/MCSManager/pty/console/iface"
 	"github.com/creack/pty"
-
-	"github.com/MCSManager/pty/core/interfaces"
 )
 
-var _ interfaces.Console = (*console)(nil)
+var _ iface.Console = (*console)(nil)
 
 type console struct {
 	file      *os.File

core/console_windows.go → console/console_windows.go

@@ -13,15 +13,15 @@ import (
 	"strings"
 	"time"
 
-	"github.com/MCSManager/pty/core/go-winpty"
-	"github.com/MCSManager/pty/core/interfaces"
+	"github.com/MCSManager/pty/console/go-winpty"
+	"github.com/MCSManager/pty/console/iface"
 	"github.com/juju/fslock"
 )
 
 //go:embed winpty
 var winpty_zip []byte
 
-var _ interfaces.Console = (*console)(nil)
+var _ iface.Console = (*console)(nil)
 
 type console struct {
 	file      *winpty.WinPTY

core/interfaces/iface.go → console/iface/iface.go

@@ -1,4 +1,4 @@
-package interfaces
+package iface
 
 import (
 	"io"

main.go

@@ -1,79 +1,7 @@
 package main
 
-import (
-	"encoding/json"
-	"flag"
-	"fmt"
-	"io"
-	"os"
-	"runtime"
-
-	pty "github.com/MCSManager/pty/core"
-	"github.com/mattn/go-colorable"
-)
-
-var (
-	dir, cmd, coder, ptySize string
-	cmds                     []string
-	colorAble                bool
-)
-
-type PtyInfo struct {
-	Pid int `json:"pid"`
-}
-
-func init() {
-	if runtime.GOOS == "windows" {
-		flag.StringVar(&cmd, "cmd", "[\"cmd\"]", "command")
-	} else {
-		flag.StringVar(&cmd, "cmd", "[\"sh\"]", "command")
-	}
-
-	flag.BoolVar(&colorAble, "color", false, "colorable (default false)")
-	flag.StringVar(&coder, "coder", "UTF-8", "Coder")
-	flag.StringVar(&dir, "dir", ".", "command work path")
-	flag.StringVar(&ptySize, "size", "80,50", "Initialize pty size, stdin will be forwarded directly")
-}
+import "github.com/MCSManager/pty/cmd/start"
 
 func main() {
-	flag.Parse()
-	json.Unmarshal([]byte(cmd), &cmds)
-
-	con := pty.New(coder, colorAble)
-	if err := con.ResizeWithString(ptySize); err != nil {
-		fmt.Printf("[MCSMANAGER-PTY] PTY ReSize Error: %v\n", err)
-		return
-	}
-
-	err := con.Start(dir, cmds)
-	info, _ := json.Marshal(&PtyInfo{
-		Pid: con.Pid(),
-	})
-	fmt.Println(string(info))
-	if err != nil {
-		fmt.Printf("[MCSMANAGER-PTY] Process Start Error: %v\n", err)
-		return
-	}
-	defer con.Close()
-
-	HandleStdIO(con)
-	con.Wait()
-}
-
-func HandleStdIO(c pty.Console) {
-	go io.Copy(c.StdIn(), os.Stdin)
-	if runtime.GOOS == "windows" && c.StdErr() != nil {
-		go io.Copy(os.Stderr, c.StdErr())
-	}
-	handleStdOut(c)
-}
-
-func handleStdOut(c pty.Console) {
-	var stdout io.Writer
-	if colorAble {
-		stdout = colorable.NewColorable(os.Stdout)
-	} else {
-		stdout = colorable.NewNonColorable(os.Stdout)
-	}
-	io.Copy(stdout, c.StdOut())
+	start.Main()
 }