Rework development page: Pre-build, Build, Populate.

Signed-off-by: Sebastien Douheret <sebastien.douheret@iot.bzh>

3 files changed, 49 insertions, 25 deletions

diff --git a/lib/apiv1/apiv1.go b/lib/apiv1/apiv1.go
index 2df8ea7..7fa69e9 100644
--- a/lib/apiv1/apiv1.go
+++ b/lib/apiv1/apiv1.go
@@ -50,10 +50,8 @@ func New(r *gin.Engine, sess *session.Sessions, cfg *xdsconfig.Config, mfolder *
 	s.apiRouter.POST("/make", s.buildMake)
 	s.apiRouter.POST("/make/:id", s.buildMake)
 
-	/* TODO: to be tested and then enabled
 	s.apiRouter.POST("/exec", s.execCmd)
 	s.apiRouter.POST("/exec/:id", s.execCmd)
-	*/
 
 	return s
 }
diff --git a/lib/apiv1/exec.go b/lib/apiv1/exec.go
index 18fdc7e..895807d 100644
--- a/lib/apiv1/exec.go
+++ b/lib/apiv1/exec.go
@@ -12,10 +12,12 @@ import (
 
 // ExecArgs JSON parameters of /exec command
 type ExecArgs struct {
-	ID         string   `json:"id"`
-	RPath      string   `json:"rpath"` // relative path into project
+	ID         string   `json:"id" binding:"required"`
+	SdkID      string   `json:"sdkid"` // sdk ID to use for setting env
 	Cmd        string   `json:"cmd" binding:"required"`
 	Args       []string `json:"args"`
+	Env        []string `json:"env"`
+	RPath      string   `json:"rpath"`   // relative path into project
 	CmdTimeout int      `json:"timeout"` // command completion timeout in Second
 }
 
@@ -51,7 +53,7 @@ func (s *APIService) execCmd(c *gin.Context) {
 		return
 	}
 
-	// TODO: add permission
+	// TODO: add permission ?
 
 	// Retrieve session info
 	sess := s.sessions.Get(c)
@@ -89,14 +91,23 @@ func (s *APIService) execCmd(c *gin.Context) {
 
 	// Define callback for output
 	var oCB common.EmitOutputCB
-	oCB = func(sid string, id int, stdout, stderr string) {
+	oCB = func(sid string, id int, stdout, stderr string, data *map[string]interface{}) {
 		// IO socket can be nil when disconnected
 		so := s.sessions.IOSocketGet(sid)
 		if so == nil {
 			s.log.Infof("%s not emitted: WS closed - sid: %s - msg id:%d", ExecOutEvent, sid, id)
 			return
 		}
-		s.log.Debugf("%s emitted - WS sid %s - id:%d", ExecOutEvent, sid, id)
+
+		// Retrieve project ID and RootPath
+		prjID := (*data)["ID"].(string)
+		prjRootPath := (*data)["RootPath"].(string)
+
+		// Cleanup any references to internal rootpath in stdout & stderr
+		stdout = strings.Replace(stdout, prjRootPath, "", -1)
+		stderr = strings.Replace(stderr, prjRootPath, "", -1)
+
+		s.log.Debugf("%s emitted - WS sid %s - id:%d - prjID:%s", ExecOutEvent, sid, id, prjID)
 
 		// FIXME replace by .BroadcastTo a room
 		err := (*so).Emit(ExecOutEvent, ExecOutMsg{
@@ -135,14 +146,26 @@ func (s *APIService) execCmd(c *gin.Context) {
 
 	cmdID := execCommandID
 	execCommandID++
+	cmd := []string{}
 
-	cmd := "cd " + prj.GetFullPath(args.RPath) + " && " + args.Cmd
+	// Setup env var regarding Sdk ID (used for example to setup cross toolchain)
+	if envCmd := s.sdks.GetEnvCmd(args.SdkID, prj.DefaultSdk); len(envCmd) > 0 {
+		cmd = append(cmd, envCmd...)
+		cmd = append(cmd, "&&")
+	}
+
+	cmd = append(cmd, "cd", prj.GetFullPath(args.RPath), "&&", args.Cmd)
 	if len(args.Args) > 0 {
-		cmd += " " + strings.Join(args.Args, " ")
+		cmd = append(cmd, args.Args...)
 	}
 
-	s.log.Debugf("Execute [Cmd ID %d]: %v %v", cmdID, cmd)
-	err := common.ExecPipeWs(cmd, sop, sess.ID, cmdID, execTmo, s.log, oCB, eCB)
+	s.log.Debugf("Execute [Cmd ID %d]: %v", cmdID, cmd)
+
+	data := make(map[string]interface{})
+	data["ID"] = prj.ID
+	data["RootPath"] = prj.RootPath
+
+	err := common.ExecPipeWs(cmd, args.Env, sop, sess.ID, cmdID, execTmo, s.log, oCB, eCB, &data)
 	if err != nil {
 		common.APIError(c, err.Error())
 		return
diff --git a/lib/apiv1/make.go b/lib/apiv1/make.go
index fb6435e..098e41c 100644
--- a/lib/apiv1/make.go
+++ b/lib/apiv1/make.go
@@ -13,11 +13,12 @@ import (
 
 // MakeArgs is the parameters (json format) of /make command
 type MakeArgs struct {
-	ID         string `json:"id"`
-	RPath      string `json:"rpath"`   // relative path into project
-	Args       string `json:"args"`    // args to pass to make command
-	SdkID      string `json:"sdkid"`   // sdk ID to use for setting env
-	CmdTimeout int    `json:"timeout"` // command completion timeout in Second
+	ID         string   `json:"id"`
+	SdkID      string   `json:"sdkid"` // sdk ID to use for setting env
+	Args       []string `json:"args"`  // args to pass to make command
+	Env        []string `json:"env"`
+	RPath      string   `json:"rpath"`   // relative path into project
+	CmdTimeout int      `json:"timeout"` // command completion timeout in Second
 }
 
 // MakeOutMsg Message send on each output (stdout+stderr) of make command
@@ -85,14 +86,9 @@ func (s *APIService) buildMake(c *gin.Context) {
 		execTmo = 24 * 60 * 60 // 1 day
 	}
 
-	cmd := "cd " + prj.GetFullPath(args.RPath) + " && make"
-	if args.Args != "" {
-		cmd += " " + args.Args
-	}
-
 	// Define callback for output
 	var oCB common.EmitOutputCB
-	oCB = func(sid string, id int, stdout, stderr string) {
+	oCB = func(sid string, id int, stdout, stderr string, data *map[string]interface{}) {
 		// IO socket can be nil when disconnected
 		so := s.sessions.IOSocketGet(sid)
 		if so == nil {
@@ -138,14 +134,21 @@ func (s *APIService) buildMake(c *gin.Context) {
 
 	cmdID := makeCommandID
 	makeCommandID++
+	cmd := []string{}
 
 	// Retrieve env command regarding Sdk ID
-	if envCmd := s.sdks.GetEnvCmd(args.SdkID, prj.DefaultSdk); envCmd != "" {
-		cmd = envCmd + " && " + cmd
+	if envCmd := s.sdks.GetEnvCmd(args.SdkID, prj.DefaultSdk); len(envCmd) > 0 {
+		cmd = append(cmd, envCmd...)
+		cmd = append(cmd, "&&")
+	}
+
+	cmd = append(cmd, "cd", prj.GetFullPath(args.RPath), "&&", "make")
+	if len(args.Args) > 0 {
+		cmd = append(cmd, args.Args...)
 	}
 
 	s.log.Debugf("Execute [Cmd ID %d]: %v", cmdID, cmd)
-	err := common.ExecPipeWs(cmd, sop, sess.ID, cmdID, execTmo, s.log, oCB, eCB)
+	err := common.ExecPipeWs(cmd, args.Env, sop, sess.ID, cmdID, execTmo, s.log, oCB, eCB, nil)
 	if err != nil {
 		common.APIError(c, err.Error())
 		return