feat: display eval error

Author: Satont

apps/api-gql/internal/services/variables/variables.go

@@ -133,13 +133,27 @@ func (c *Service) EvaluateScript(
 			return "", fmt.Errorf("cannot evaluate script: %w", err)
 		}
 
-		return result, nil
+		var res string
+		if result.Result != "" {
+			res = result.Result
+		} else if result.Error != "" {
+			res = result.Error
+		}
+
+		return res, nil
 	}
 
 	result, err := c.executron.ExecuteUserCode(ctx, "javascript", script)
 	if err != nil {
 		return "", fmt.Errorf("cannot evaluate script: %w", err)
 	}
 
-	return result, nil
+	var res string
+	if result.Result != "" {
+		res = result.Result
+	} else if result.Error != "" {
+		res = result.Error
+	}
+
+	return res, nil
 }

apps/parser/internal/variables/chat_eval/chat_eval.go

@@ -26,13 +26,20 @@ var ChatEval = &types.Variable{
 
 		script := fmt.Sprintf(`return %s`, *parseCtx.Text)
 
-		res, err := parseCtx.Services.Executron.ExecuteUserCode(ctx, "javascript", script)
+		req, err := parseCtx.Services.Executron.ExecuteUserCode(ctx, "javascript", script)
 		if err != nil {
 			parseCtx.Services.Logger.Sugar().Error(err)
 			result.Result = "Probably you're doing some suspicious things or wrote wrong code."
 			return result, nil
 		}
 
+		var res string
+		if req.Result != "" {
+			res = req.Result
+		} else if req.Error != "" {
+			res = req.Error
+		}
+
 		result.Result = res
 		return result, nil
 	},

apps/parser/internal/variables/custom_var/custom_var.go

@@ -82,7 +82,11 @@ var CustomVar = &types.Variable{
 				)
 			}
 
-			result.Result = res
+			if res.Result != "" {
+				result.Result = res.Result
+			} else if res.Error != "" {
+				result.Result = res.Error
+			}
 		}
 
 		if v.Type == model.CustomVarText || v.Type == model.CustomVarNumber {

apps/parser/pkg/executron/executron.go

@@ -14,7 +14,7 @@ type request struct {
 	Code     string `json:"code"`
 }
 
-type response struct {
+type Response struct {
 	Result string `json:"result"`
 	Error  string `json:"error"`
 }
@@ -29,11 +29,11 @@ type Executron struct {
 	apiUrl string
 }
 
-func (c *Executron) ExecuteUserCode(ctx context.Context, language, code string) (string, error) {
+func (c *Executron) ExecuteUserCode(ctx context.Context, language, code string) (*Response, error) {
 	u, _ := url.Parse(c.apiUrl)
 	u.Path = "/run"
 
-	var executeResponse response
+	var executeResponse Response
 	resp, err := req.R().
 		SetContext(ctx).
 		SetBodyJsonMarshal(
@@ -45,15 +45,15 @@ func (c *Executron) ExecuteUserCode(ctx context.Context, language, code string)
 		SetSuccessResult(&executeResponse).
 		Post(u.String())
 	if err != nil {
-		return "", err
+		return nil, err
 	}
 	if !resp.IsSuccessState() {
-		return "", fmt.Errorf("cannot execute code: %s", resp.String())
+		return nil, fmt.Errorf("cannot execute code: %s", resp.String())
 	}
 
 	if executeResponse.Error != "" {
-		return "", fmt.Errorf("cannot execute code: %s", executeResponse.Error)
+		return nil, fmt.Errorf("cannot execute code: %s", executeResponse.Error)
 	}
 
-	return executeResponse.Result, nil
+	return &executeResponse, nil
 }