first step to lib reformation

main.go

@@ -1,152 +1,19 @@
 package main
 
 import (
-	"context"
-	"fmt"
+	"github.com/kernel-punk/gotty/gottyLib"
 	"log"
-	"os"
-	"os/signal"
-	"strings"
-	"syscall"
-
-	"github.com/urfave/cli"
-
-	"github.com/kernel-punk/gotty/backend/localcommand"
-	"github.com/kernel-punk/gotty/pkg/homedir"
-	"github.com/kernel-punk/gotty/server"
-	"github.com/kernel-punk/gotty/utils"
 )
 
 func main() {
-	app := cli.NewApp()
-	app.Name = "gotty"
-	app.Version = Version + "+" + CommitID
-	app.Usage = "Share your terminal as a web application"
-	app.HideHelp = true
-	cli.AppHelpTemplate = helpTemplate
 
-	appOptions := &server.Options{}
-	if err := utils.ApplyDefaultValues(appOptions); err != nil {
-		exit(err, 1)
-	}
-	backendOptions := &localcommand.Options{}
-	if err := utils.ApplyDefaultValues(backendOptions); err != nil {
-		exit(err, 1)
+	if err := gottyLib.Run(gottyLib.RunParameters{
+
+		Cmd:  "htop",
+		Args: []string{},
+		Ssl:  false,
+	}); err != nil {
+		log.Fatal(err)
 	}
 
-	cliFlags, flagMappings, err := utils.GenerateFlags(appOptions, backendOptions)
-	if err != nil {
-		exit(err, 3)
-	}
-
-	app.Flags = append(
-		cliFlags,
-		cli.StringFlag{
-			Name:   "config",
-			Value:  "~/.gotty",
-			Usage:  "Config file path",
-			EnvVar: "GOTTY_CONFIG",
-		},
-	)
-
-	app.Action = func(c *cli.Context) {
-		if len(c.Args()) == 0 {
-			msg := "Error: No command given."
-			cli.ShowAppHelp(c)
-			exit(fmt.Errorf(msg), 1)
-		}
-
-		configFile := c.String("config")
-		_, err := os.Stat(homedir.Expand(configFile))
-		if configFile != "~/.gotty" || !os.IsNotExist(err) {
-			if err := utils.ApplyConfigFile(configFile, appOptions, backendOptions); err != nil {
-				exit(err, 2)
-			}
-		}
-
-		utils.ApplyFlags(cliFlags, flagMappings, c, appOptions, backendOptions)
-
-		appOptions.EnableBasicAuth = c.IsSet("credential")
-		appOptions.EnableTLSClientAuth = c.IsSet("tls-ca-crt")
-
-		err = appOptions.Validate()
-		if err != nil {
-			exit(err, 6)
-		}
-
-		args := c.Args()
-		factory, err := localcommand.NewFactory(args[0], args[1:], backendOptions)
-		if err != nil {
-			exit(err, 3)
-		}
-
-		hostname, _ := os.Hostname()
-		appOptions.TitleVariables = map[string]interface{}{
-			"command":  args[0],
-			"argv":     args[1:],
-			"hostname": hostname,
-		}
-
-		srv, err := server.New(factory, appOptions)
-		if err != nil {
-			exit(err, 3)
-		}
-
-		ctx, cancel := context.WithCancel(context.Background())
-		gCtx, gCancel := context.WithCancel(context.Background())
-
-		log.Printf("GoTTY is starting with command: %s", strings.Join(args, " "))
-
-		errs := make(chan error, 1)
-		go func() {
-			errs <- srv.Run(ctx, server.WithGracefullContext(gCtx))
-		}()
-		err = waitSignals(errs, cancel, gCancel)
-
-		if err != nil && err != context.Canceled {
-			fmt.Printf("Error: %s\n", err)
-			exit(err, 8)
-		}
-
-	}
-	app.Run(os.Args)
-}
-
-func exit(err error, code int) {
-	if err != nil {
-		fmt.Println(err)
-	}
-	os.Exit(code)
-}
-
-func waitSignals(errs chan error, cancel context.CancelFunc, gracefullCancel context.CancelFunc) error {
-	sigChan := make(chan os.Signal, 1)
-	signal.Notify(
-		sigChan,
-		syscall.SIGINT,
-		syscall.SIGTERM,
-	)
-
-	select {
-	case err := <-errs:
-		return err
-
-	case s := <-sigChan:
-		switch s {
-		case syscall.SIGINT:
-			gracefullCancel()
-			fmt.Println("C-C to force close")
-			select {
-			case err := <-errs:
-				return err
-			case <-sigChan:
-				fmt.Println("Force closing...")
-				cancel()
-				return <-errs
-			}
-		default:
-			cancel()
-			return <-errs
-		}
-	}
 }