Implement run command for typescript node clients

Author: juho05

new_client.go

@@ -6,6 +6,7 @@ import (
 	"strings"
 
 	"github.com/Bananenpro/cli"
+	"github.com/code-game-project/go-utils/cgfile"
 	"github.com/code-game-project/go-utils/cggenevents"
 	"github.com/code-game-project/go-utils/exec"
 	"github.com/code-game-project/go-utils/modules"
@@ -51,6 +52,17 @@ func CreateNewClient(projectName string) error {
 	if err != nil {
 		return err
 	}
+
+	cgConf, err := cgfile.LoadCodeGameFile("")
+	if err != nil {
+		return err
+	}
+	cgConf.LangConfig["runtime"] = runtime
+	err = cgConf.Write("")
+	if err != nil {
+		return err
+	}
+
 	node := runtime == "node"
 
 	if !node {

new_server.go

@@ -1,8 +1,6 @@
 package main
 
 import (
-	"os"
-
 	"github.com/Bananenpro/cli"
 	"github.com/code-game-project/go-utils/exec"
 	"github.com/code-game-project/go-utils/modules"
@@ -17,8 +15,7 @@ var serverDockerfileTemplate string
 var serverDockerignoreTemplate string
 
 func CreateNewServer(projectName string) error {
-	cli.Error("not implemented")
-	os.Exit(1)
+	panic("not implemented")
 
 	data, err := modules.ReadCommandConfig[modules.NewServerData]()
 	_ = data

run.go

@@ -2,39 +2,79 @@ package main
 
 import (
 	"fmt"
+	"os"
+	"os/exec"
+	"strings"
 
 	"github.com/code-game-project/go-utils/cgfile"
+	cgExec "github.com/code-game-project/go-utils/exec"
 	"github.com/code-game-project/go-utils/external"
 	"github.com/code-game-project/go-utils/modules"
 )
 
 func Run() error {
-	config, err := cgfile.LoadCodeGameFile("")
+	data, err := modules.ReadCommandConfig[modules.RunData]()
 	if err != nil {
 		return err
 	}
 
-	data, err := modules.ReadCommandConfig[modules.RunData]()
+	typescript := data.Lang == "ts"
+
+	config, err := cgfile.LoadCodeGameFile("")
 	if err != nil {
 		return err
 	}
+	runtime := config.LangConfig["runtime"]
+	node := runtime == "node"
+
+	if !typescript || !node {
+		panic("not implemented")
+	}
 
 	url := external.TrimURL(config.URL)
 
 	switch config.Type {
 	case "client":
-		return runClient(url, data.Args)
+		return runClient(url, data.Args, typescript, node)
 	case "server":
-		return runServer(data.Args)
+		return runServer(data.Args, typescript, node)
 	default:
 		return fmt.Errorf("Unknown project type: %s", config.Type)
 	}
 }
 
-func runClient(url string, args []string) error {
+func runClient(url string, args []string, typescript, node bool) error {
+	if typescript {
+		_, err := cgExec.Execute(true, "npx", "tsc")
+		if err != nil {
+			return err
+		}
+	}
+
+	cmdArgs := []string{"dist/index.js"}
+	cmdArgs = append(cmdArgs, args...)
+
+	env := []string{"CG_GAME_URL=" + url}
+	env = append(env, os.Environ()...)
+
+	if _, err := exec.LookPath("node"); err != nil {
+		return fmt.Errorf("'node' ist not installed!")
+	}
+
+	cmd := exec.Command("node", cmdArgs...)
+	cmd.Stdin = os.Stdin
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	cmd.Env = env
+
+	err := cmd.Run()
+	if err != nil {
+		return fmt.Errorf("Failed to run 'CG_GAME_URL=%s node %s'", url, strings.Join(cmdArgs, " "))
+	}
 	return nil
 }
 
-func runServer(args []string) error {
+func runServer(args []string, typescript, node bool) error {
+	panic("not implemented")
 	return nil
 }