Merge branch 'ft-generate-command-cli'

cli/coffee/build.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"errors"
 	"github.com/YairLevi/Coffee/cli/coffee/util"
 	"github.com/charmbracelet/log"
 	"os"
@@ -12,41 +11,67 @@ var sourceDirMapping = map[string]string{
 	"angular-ts": "frontend/dist/angular-ts/browser",
 }
 
-func Build() error {
+func Build() {
 	if len(os.Args) < 3 {
-		return errors.New("specify which ui template to build for (will change later)")
+		log.Error("specify which ui template to build for (will change later)")
+		return
 	}
 	err := os.Chdir("frontend")
 	if err != nil {
-		return err
+		log.Errorf("error: %v", err)
+		return
 	}
 
-	log.Info("Making frontend dist folder")
-	buildFront := util.CommandWithLog("npm", "run", "build")
-	err = buildFront.Run()
+	_, err = RunCommand(CmdProps{
+		Cmd:       BuildFrontend,
+		Sync:      true,
+		LogBefore: "Making frontend dist folder",
+		Opts:      Opts(WithStdout, WithStderr),
+	})
 	if err != nil {
-		return err
+		log.Errorf("Failed to build frontend: %v", err)
+		return
 	}
 
 	err = os.Chdir("..")
 	if err != nil {
-		return err
+		log.Errorf("error moving directory: %v", err)
+		return
 	}
 
 	log.Info("Adding frontend to resources")
 	sourceDir := sourceDirMapping[os.Args[2]]
 	err = util.MoveDirectory(sourceDir, "src/main/resources/dist")
 	if err != nil {
-		return err
+		log.Errorf("Failed to move dist folder to the resources folder.  %v", err)
+		return
 	}
 
-	log.Info("Bundling to JAR")
-	buildApp := util.CommandWithLog("mvn", "clean", "compile", "assembly:single")
-	err = buildApp.Run()
+	log.Info("Preparing for bundle")
+	file, err := os.Create("src/main/resources/__jar__")
 	if err != nil {
-		return err
+		log.Errorf("Unexpected error: production flag was not able to set. %v", err)
+		return
+	}
+	file.Close()
+
+	_, err = RunCommand(CmdProps{
+		Cmd:       BundleApp,
+		LogBefore: "Bundling to JAR",
+		Sync:      true,
+		Opts:      Opts(WithStdout, WithStderr),
+	})
+	if err != nil {
+		log.Errorf("Failed to build app into JAR. %v", err)
+		return
+	}
+
+	log.Info("Post bundle cleanup")
+	err = os.Remove("src/main/resources/__jar__")
+	if err != nil {
+		log.Errorf("Unexpected error: was not able to delete temporary production flag. %v", err)
+		return
 	}
 
 	log.Info("Done. your JAR is located at `./target")
-	return nil
 }

cli/coffee/commands.go

@@ -0,0 +1,61 @@
+package main
+
+import (
+	"github.com/charmbracelet/log"
+	"os"
+	"os/exec"
+	"strings"
+)
+
+const (
+	InstallFrontendDependencies = "npm install"
+	LaunchDevServer             = "npm run dev"
+	BuildFrontend               = "npm run build"
+	CompileBackend              = "mvn compile"
+	BundleApp                   = "mvn compile assembly:single"
+	LaunchApp                   = "mvn exec:java"
+	GenerateAppBinds            = "mvn exec:java -Dexec.args=\"generate\""
+)
+
+type Opt = func(cmd *exec.Cmd)
+
+func WithStdout(cmd *exec.Cmd) {
+	cmd.Stdout = os.Stdout
+}
+
+func WithStderr(cmd *exec.Cmd) {
+	cmd.Stderr = os.Stderr
+}
+
+type CmdProps struct {
+	Cmd       string
+	LogBefore string
+	Sync      bool
+	Opts      []Opt
+}
+
+func Opts(opts ...Opt) []Opt {
+	var ropts []Opt
+	for _, o := range opts {
+		ropts = append(ropts, o)
+	}
+	return ropts
+}
+
+func RunCommand(props CmdProps) (*exec.Cmd, error) {
+	words := strings.Split(props.Cmd, " ")
+	name := words[0]
+	args := words[1:]
+	command := exec.Command(name, args...)
+	for _, opt := range props.Opts {
+		opt(command)
+	}
+	var err error = nil
+	log.Info(props.LogBefore)
+	if props.Sync {
+		err = command.Run()
+	} else {
+		err = command.Start()
+	}
+	return command, err
+}

cli/coffee/dev.go

@@ -4,63 +4,94 @@ import (
 	"fmt"
 	"github.com/YairLevi/Coffee/cli/coffee/util"
 	"github.com/charmbracelet/log"
+	"net"
 	"os"
-	"os/exec"
+	"time"
 )
 
-func Dev() error {
-	err := os.Chdir("frontend")
+func Dev() {
+	_, err := RunCommand(CmdProps{
+		Cmd:       CompileBackend,
+		Sync:      true,
+		Opts:      Opts(WithStderr, WithStdout),
+		LogBefore: "Compiling Application",
+	})
 	if err != nil {
-		fmt.Println(err.Error())
-		return err
+		log.Error("Failed to compile backend code.", "err", err)
+		return
 	}
-	log.Info("Installing dependencies")
-	err = exec.Command("npm", "install").Run()
+
+	_, err = RunCommand(CmdProps{
+		Cmd:       GenerateAppBinds,
+		LogBefore: "Generating type-safe frontend bindings...",
+		Sync:      true,
+		Opts:      Opts(WithStderr),
+	})
 	if err != nil {
-		fmt.Println(err.Error())
-		return err
+		log.Errorf("Failed to create bindings. %v", err)
+		return
 	}
 
-	log.Info("Starting development server")
-	devServer := exec.Command("npm", "run", "dev")
-	devServer.Stderr = os.Stderr
-	err = devServer.Start()
+	err = os.Chdir("frontend")
 	if err != nil {
-		log.Error(err.Error())
-		return err
+		log.Error("Can't go to frontend directory.", "err", err)
+		return
 	}
 
-	err = os.Chdir("..")
+	_, err = RunCommand(CmdProps{
+		Cmd:       InstallFrontendDependencies,
+		LogBefore: "Installing dependencies",
+		Sync:      true,
+	})
 	if err != nil {
-		fmt.Println(err.Error())
-		return err
+		log.Error("Failed to download NPM dependencies.", "err", err)
+		return
 	}
 
-	log.Info("Compiling Application")
-	compile := exec.Command("mvn", "clean", "compile")
-	compile.Stderr = os.Stderr
-	err = compile.Run()
+	devServerCmd, err := RunCommand(CmdProps{
+		Cmd:       LaunchDevServer,
+		LogBefore: "Starting development server",
+		Opts:      Opts(WithStderr),
+		Sync:      false,
+	})
 	if err != nil {
-		log.Error(err.Error())
-		return err
+		log.Error("Failed to start dev server.", "err", err)
+		return
+	}
+	defer func() {
+		log.Info("Shutting down frontend dev server")
+		err = util.StopProcessTree(devServerCmd.Process.Pid)
+		if err != nil {
+			log.Error("Failed to close the entire process tree of the dev server.", "err", err)
+		}
+	}()
+	log.Info("Waiting for dev server to fully start")
+	for {
+		host, port := "localhost", "5173"
+		timeout := time.Millisecond * 500
+		conn, err := net.DialTimeout("tcp", net.JoinHostPort(host, port), timeout)
+		if err == nil {
+			break
+		}
+		if conn != nil {
+			conn.Close()
+		}
 	}
 
-	log.Info("Running. application logging below")
-	log.Info("\n==================================\n")
-	cmd := exec.Command("mvn", "exec:java")
-	cmd.Stdout = os.Stdout
-	cmd.Stderr = os.Stderr
-	err = cmd.Run()
+	err = os.Chdir("..")
 	if err != nil {
-		fmt.Println(err.Error())
-		return err
+		log.Error("Can't go back to project directory.", "err", err)
+		return
 	}
-	log.Info("\n==================================\n")
-	log.Info("Shutting down frontend dev server")
-	err = util.StopProcessTree(devServer.Process.Pid)
+
+	_, err = RunCommand(CmdProps{
+		Cmd:       LaunchApp,
+		Opts:      Opts(WithStderr, WithStdout),
+		Sync:      true,
+		LogBefore: "Running. application logging below",
+	})
 	if err != nil {
-		log.Error("Failed to close the entire process tree of the dev server.")
-		return err
+		fmt.Println("Failed to launch application.", "err", err)
+		return
 	}
-	return nil
 }

cli/coffee/generate.go

@@ -0,0 +1,27 @@
+package main
+
+import "github.com/charmbracelet/log"
+
+func Generate() {
+	_, err := RunCommand(CmdProps{
+		Cmd:       CompileBackend,
+		Sync:      true,
+		LogBefore: "Compiling backend code",
+		Opts:      Opts(WithStdout, WithStderr),
+	})
+	if err != nil {
+		log.Errorf("Error compiling backend code for generate. %v", err)
+		return
+	}
+
+	_, err = RunCommand(CmdProps{
+		Cmd:       GenerateAppBinds,
+		Opts:      Opts(WithStdout, WithStderr),
+		LogBefore: "Generating bindings.",
+		Sync:      true,
+	})
+	if err != nil {
+		log.Errorf("Couldn't generate bindings for some reason. %v", err)
+		return
+	}
+}