-
Notifications
You must be signed in to change notification settings - Fork 1.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: toolbox exec session management (#1732)
Signed-off-by: Toma Puljak <[email protected]>
- Loading branch information
Showing
32 changed files
with
4,102 additions
and
110 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,153 @@ | ||
| // Copyright 2024 Daytona Platforms Inc. | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| package session | ||
|
|
||
| import ( | ||
| "bytes" | ||
| "context" | ||
| "errors" | ||
| "fmt" | ||
| "net/http" | ||
| "os" | ||
| "path/filepath" | ||
| "regexp" | ||
| "strconv" | ||
| "strings" | ||
|
|
||
| "github.com/daytonaio/daytona/internal/util" | ||
| "github.com/gin-gonic/gin" | ||
| "github.com/google/uuid" | ||
| ) | ||
|
|
||
| func SessionExecuteCommand(configDir string) func(c *gin.Context) { | ||
| return func(c *gin.Context) { | ||
| sessionId := c.Param("sessionId") | ||
|
|
||
| var request SessionExecuteRequest | ||
| if err := c.ShouldBindJSON(&request); err != nil { | ||
| c.AbortWithError(http.StatusBadRequest, err) | ||
| return | ||
| } | ||
|
|
||
| session, ok := sessions[sessionId] | ||
| if !ok { | ||
| c.AbortWithError(http.StatusNotFound, errors.New("session not found")) | ||
| return | ||
| } | ||
|
|
||
| var cmdId *string | ||
| var logFile *os.File | ||
|
|
||
| cmdId = util.Pointer(uuid.NewString()) | ||
|
|
||
| command := &Command{ | ||
| Id: *cmdId, | ||
| Command: request.Command, | ||
| } | ||
| session.commands[*cmdId] = command | ||
|
|
||
| logFilePath := command.LogFilePath(session.Dir(configDir)) | ||
|
|
||
| err := os.MkdirAll(filepath.Dir(logFilePath), 0755) | ||
| if err != nil { | ||
| c.AbortWithError(http.StatusInternalServerError, err) | ||
| return | ||
| } | ||
|
|
||
| logFile, err = os.Create(logFilePath) | ||
| if err != nil { | ||
| c.AbortWithError(http.StatusInternalServerError, err) | ||
| return | ||
| } | ||
|
|
||
| cmdToExec := fmt.Sprintf("%s > %s 2>&1 ; echo \"DTN_EXIT: $?\" >> %s\n", request.Command, logFile.Name(), logFile.Name()) | ||
|
|
||
| type execResult struct { | ||
| out string | ||
| err error | ||
| exitCode *int | ||
| } | ||
| resultChan := make(chan execResult) | ||
|
|
||
| go func() { | ||
| out := "" | ||
| defer close(resultChan) | ||
|
|
||
| logChan := make(chan []byte) | ||
| errChan := make(chan error) | ||
|
|
||
| go util.ReadLog(context.Background(), logFile, true, logChan, errChan) | ||
|
|
||
| defer logFile.Close() | ||
|
|
||
| for { | ||
| select { | ||
| case logEntry := <-logChan: | ||
| logEntry = bytes.Trim(logEntry, "\x00") | ||
| if len(logEntry) == 0 { | ||
| continue | ||
| } | ||
| exitCode, line := extractExitCode(string(logEntry)) | ||
| out += line | ||
|
|
||
| if exitCode != nil { | ||
| sessions[sessionId].commands[*cmdId].ExitCode = exitCode | ||
| resultChan <- execResult{out: out, exitCode: exitCode, err: nil} | ||
| return | ||
| } | ||
| case err := <-errChan: | ||
| if err != nil { | ||
| resultChan <- execResult{out: out, exitCode: nil, err: err} | ||
| return | ||
| } | ||
| } | ||
| } | ||
| }() | ||
|
|
||
| _, err = session.stdinWriter.Write([]byte(cmdToExec)) | ||
| if err != nil { | ||
| c.AbortWithError(http.StatusBadRequest, err) | ||
| return | ||
| } | ||
|
|
||
| if request.Async { | ||
| c.JSON(http.StatusAccepted, SessionExecuteResponse{ | ||
| CommandId: cmdId, | ||
| }) | ||
| return | ||
| } | ||
|
|
||
| result := <-resultChan | ||
| if result.err != nil { | ||
| c.AbortWithError(http.StatusBadRequest, result.err) | ||
| return | ||
| } | ||
|
|
||
| c.JSON(http.StatusOK, SessionExecuteResponse{ | ||
| CommandId: cmdId, | ||
| Output: &result.out, | ||
| ExitCode: result.exitCode, | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| func extractExitCode(output string) (*int, string) { | ||
| var exitCode *int | ||
|
|
||
| regex := regexp.MustCompile(`DTN_EXIT: (\d+)\n`) | ||
| matches := regex.FindStringSubmatch(output) | ||
| if len(matches) > 1 { | ||
| code, err := strconv.Atoi(matches[1]) | ||
| if err != nil { | ||
| return nil, output | ||
| } | ||
| exitCode = &code | ||
| } | ||
|
|
||
| if exitCode != nil { | ||
| output = strings.Replace(output, fmt.Sprintf("DTN_EXIT: %d\n", *exitCode), "", 1) | ||
| } | ||
|
|
||
| return exitCode, output | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| // Copyright 2024 Daytona Platforms Inc. | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| package session | ||
|
|
||
| import ( | ||
| "errors" | ||
| "net/http" | ||
| "os" | ||
|
|
||
| "github.com/daytonaio/daytona/internal/util" | ||
| "github.com/daytonaio/daytona/pkg/api/controllers/log" | ||
| "github.com/gin-gonic/gin" | ||
| "github.com/gorilla/websocket" | ||
| ) | ||
|
|
||
| func GetSessionCommandLogs(configDir string) func(c *gin.Context) { | ||
| return func(c *gin.Context) { | ||
| sessionId := c.Param("sessionId") | ||
| cmdId := c.Param("commandId") | ||
|
|
||
| session, ok := sessions[sessionId] | ||
| if !ok { | ||
| c.AbortWithError(http.StatusNotFound, errors.New("session not found")) | ||
| return | ||
| } | ||
|
|
||
| command, ok := sessions[sessionId].commands[cmdId] | ||
| if !ok { | ||
| c.AbortWithError(http.StatusNotFound, errors.New("command not found")) | ||
| return | ||
| } | ||
|
|
||
| path := command.LogFilePath(session.Dir(configDir)) | ||
|
|
||
| if c.Request.Header.Get("Upgrade") == "websocket" { | ||
| logFile, err := os.Open(path) | ||
| if err != nil { | ||
| if os.IsNotExist(err) { | ||
| c.AbortWithError(http.StatusNotFound, errors.New("log file not found")) | ||
| return | ||
| } | ||
| c.AbortWithError(http.StatusInternalServerError, err) | ||
| return | ||
| } | ||
| defer logFile.Close() | ||
| log.ReadLog(c, logFile, util.ReadLog, func(conn *websocket.Conn, messages chan []byte, errors chan error) { | ||
| for { | ||
| msg := <-messages | ||
| _, output := extractExitCode(string(msg)) | ||
| err := conn.WriteMessage(websocket.TextMessage, []byte(output)) | ||
| if err != nil { | ||
| errors <- err | ||
| break | ||
| } | ||
| } | ||
| }) | ||
| return | ||
| } | ||
|
|
||
| content, err := os.ReadFile(path) | ||
| if err != nil { | ||
| if os.IsNotExist(err) { | ||
| c.AbortWithError(http.StatusNotFound, errors.New("log file not found")) | ||
| return | ||
| } | ||
| c.AbortWithError(http.StatusInternalServerError, err) | ||
| return | ||
| } | ||
|
|
||
| _, output := extractExitCode(string(content)) | ||
| c.String(http.StatusOK, output) | ||
| } | ||
| } |
Oops, something went wrong.