Merge pull request #50 from HexmosTech/fix/lsp-returning-error

Fix LSP crashing due to log.fatal

Author: rogueloop

cmdexec/cmdexec.go

@@ -7,7 +7,6 @@
 package cmdexec
 
 import (
-	"errors"
 	"os"
 	"strings"
 	"time"
@@ -28,7 +27,7 @@ func ExecCommand(cmdSlice []string, stdinBody string, apiDir string) (httpie.ExR
 	start := time.Now()
 	resp, err := httpie.Lama2Entry(cmdSlice, strings.NewReader(stdinBody))
 	if err != nil {
-		return httpie.ExResponse{}, 0, errors.New("Error from API executor: " + err.Error())
+		return httpie.ExResponse{}, 0, err
 	}
 	elapsed := time.Since(start)
 	utils.ChangeWorkingDir(oldDir)

cmdexec/js.go

@@ -3,6 +3,8 @@
 package cmdexec
 
 import (
+	"errors"
+
 	"github.com/dop251/goja"
 	"github.com/dop251/goja_nodejs/console"
 	"github.com/dop251/goja_nodejs/require"
@@ -25,14 +27,15 @@ func GetJSVm() interface{} {
 // Note: the vm runtime remains modified; so if
 // you reuse the vm for other operations, the state
 // from previous invocations carry over
-func RunVMCode(jsCode string, vm interface{}) {
+func RunVMCode(jsCode string, vm interface{}) error {
 	if vm == nil {
 		vm = GetJSVm()
 	}
 	_, err := vm.(*goja.Runtime).RunString(jsCode)
 	if ex, ok := err.(*goja.Exception); ok {
-		log.Fatal().Str("Error executing JS processor block", ex.String()).Msg("")
+		return errors.New("Executing JS processor block: " + ex.String())
 	}
+	return nil
 }
 
 // GenerateChainCode takes in an HTTP response body

codegen/codegen.cli.go

@@ -27,7 +27,7 @@ func initialize() {
 
 var flag = 0
 
-func GenerateTargetCode(targetLangLib string, parsedAPI *gabs.Container) (string) {
+func GenerateTargetCode(targetLangLib string, parsedAPI *gabs.Container) string {
 	convertedSnippetFinal := generateConvertedSippet(targetLangLib, parsedAPI)
 	clipboard.WriteAll(convertedSnippetFinal)
 	log.Info().Msg("Code copied to clipboard")

controller/controller.cli.go

@@ -73,34 +73,41 @@ func Process(version string) {
 	log.Debug().Str("Parsed API", parsedAPI.String()).Msg("")
 	res, out, responseTime, statusCodes, contentSizes, err := HandleParsedFile(parsedAPI, o, dir)
 	if err != nil {
-		log.Fatal().Str("Type", "Controller").Msg(fmt.Sprint("Error: ", err))
+		log.Error().Str("Type", "Controller").Msg(fmt.Sprint("Error: ", err))
 	}
 	if out.Output != "" {
 		outputmanager.WriteJSONOutput(res, out.Output, responseTime, statusCodes, contentSizes)
 	}
 }
 
-func processBlocks(parsedAPIblocks []*gabs.Container, o *lama2cmd.Opts, dir string) (httpie.ExResponse, *lama2cmd.Opts, []outputmanager.ResponseTime, []outputmanager.StatusCode, []outputmanager.ContentSize) {
+func processBlocks(parsedAPIblocks []*gabs.Container, o *lama2cmd.Opts, dir string) (httpie.ExResponse, *lama2cmd.Opts, []outputmanager.ResponseTime, []outputmanager.StatusCode, []outputmanager.ContentSize, error) {
 	vm := cmdexec.GetJSVm()
 	var resp httpie.ExResponse
 	var responseTime []outputmanager.ResponseTime
 	var statusCode []outputmanager.StatusCode
 	var contentSize []outputmanager.ContentSize
 	var timeInMs int64
+	var e1 error
 	for i, block := range parsedAPIblocks {
 		log.Debug().Int("Block num", i).Msg("")
 		log.Debug().Str("Block getting processed", block.String()).Msg("")
 		blockType := block.S("type").Data().(string)
 		switch blockType {
 		case "processor":
-			ExecuteProcessorBlock(block, vm)
+			err := ExecuteProcessorBlock(block, vm)
+			if err != nil {
+				return httpie.ExResponse{}, o, responseTime, statusCode, contentSize, err
+			}
 		case "Lama2File":
-			resp, timeInMs = processLama2FileBlock(block, vm, o, dir)
+			resp, timeInMs, e1 = processLama2FileBlock(block, vm, o, dir)
+			if e1 != nil {
+				return httpie.ExResponse{}, o, responseTime, statusCode, contentSize, e1
+			}
 			log.Info().Str("ResponseTime", fmt.Sprintf("%dms", timeInMs)).Msg("")
 			responseTime, statusCode, contentSize = CalculateMetrics(resp, timeInMs, responseTime, statusCode, contentSize)
 		}
 	}
-	return resp, o, responseTime, statusCode, contentSize
+	return resp, o, responseTime, statusCode, contentSize, nil
 }
 
 func ExecuteRequestorBlockHelper(resp httpie.ExResponse, headersString string, e1 error, vm interface{}) httpie.ExResponse {
@@ -114,11 +121,15 @@ func ExecuteRequestorBlockHelper(resp httpie.ExResponse, headersString string, e
 	return resp
 }
 
-func ExecuteProcessorBlock(block *gabs.Container, vm interface{}) {
+func ExecuteProcessorBlock(block *gabs.Container, vm interface{}) error {
 	b := block.S("value").Data().(*gabs.Container)
 	log.Debug().Str("Processor block incoming block", block.String()).Msg("")
 	script := b.Data().(string)
-	cmdexec.RunVMCode(script, vm)
+	err := cmdexec.RunVMCode(script, vm)
+	if err != nil {
+		return err
+	}
+	return nil
 }
 
 func CalculateMetrics(resp httpie.ExResponse, timeInMs int64, responseTime []outputmanager.ResponseTime, statusCodes []outputmanager.StatusCode, contentSizes []outputmanager.ContentSize) ([]outputmanager.ResponseTime, []outputmanager.StatusCode, []outputmanager.ContentSize) {

controller/controller.go

@@ -19,7 +19,10 @@ import (
 func HandleParsedFileHelper(parsedAPI *gabs.Container, args ...interface{}) (httpie.ExResponse, *lama2cmd.Opts, []outputmanager.ResponseTime, []outputmanager.StatusCode, []outputmanager.ContentSize, error) {
 	parsedAPIblocks := GetParsedAPIBlocks(parsedAPI)
 	o, dir := extractArgs(args)
-	resp, opts, responseTimes, statusCode, contentSize := processBlocks(parsedAPIblocks, o, dir)
+	resp, opts, responseTimes, statusCode, contentSize, e1 := processBlocks(parsedAPIblocks, o, dir)
+	if e1 != nil {
+		return httpie.ExResponse{}, o, responseTimes, statusCode, contentSize, e1
+	}
 	return resp, opts, responseTimes, statusCode, contentSize, nil
 }
 
@@ -44,20 +47,23 @@ func extractArgs(args []interface{}) (*lama2cmd.Opts, string) {
 	return o, dir
 }
 
-func processLama2FileBlock(block *gabs.Container, vm interface{}, o *lama2cmd.Opts, dir string) (httpie.ExResponse, int64) {
+func processLama2FileBlock(block *gabs.Container, vm interface{}, o *lama2cmd.Opts, dir string) (httpie.ExResponse, int64, error) {
 	preprocess.ProcessVarsInBlock(block, vm)
 	cmd, stdinBody := cmdgen.ConstructCommand(block, o)
 	var resp httpie.ExResponse
 	var e1 error
 	resp, responseTime, e1 := cmdexec.ExecCommand(cmd, stdinBody, dir)
+	if e1 != nil {
+		return httpie.ExResponse{}, 0, e1
+	}
 	headers := resp.Headers
 	var headersString string
 	for key, value := range headers {
 		headersString += fmt.Sprintf("%s: %s\n", key, value)
 	}
 
 	resp = ExecuteRequestorBlockHelper(resp, headersString, e1, vm)
-	return resp, responseTime
+	return resp, responseTime, nil
 }
 
 // func processBlocks(parsedAPIblocks []*gabs.Container, o *lama2cmd.Opts, dir string) (httpie.ExResponse, *lama2cmd.Opts) {

controller/controller.wasm.go

@@ -75,7 +75,7 @@ func ExecuteRequestorBlockHelper(resp httpie.ExResponse, headersString string, e
 	return resp
 }
 
-func processBlocks(parsedAPIblocks []*gabs.Container, o *lama2cmd.Opts, dir string) (httpie.ExResponse, *lama2cmd.Opts, []outputmanager.ResponseTime, []outputmanager.StatusCode, []outputmanager.ContentSize) {
+func processBlocks(parsedAPIblocks []*gabs.Container, o *lama2cmd.Opts, dir string) (httpie.ExResponse, *lama2cmd.Opts, []outputmanager.ResponseTime, []outputmanager.StatusCode, []outputmanager.ContentSize, error) {
 	worker = preprocess.InitWebWorker() // Initialize the web worker
 	var resp httpie.ExResponse
 	for i, block := range parsedAPIblocks {
@@ -86,10 +86,10 @@ func processBlocks(parsedAPIblocks []*gabs.Container, o *lama2cmd.Opts, dir stri
 		case "processor":
 			ExecuteProcessorBlock(block)
 		case "Lama2File":
-			resp, _ = processLama2FileBlock(block, worker, o, dir)
+			resp, _, _ = processLama2FileBlock(block, worker, o, dir)
 		}
 	}
-	return resp, o, nil, nil, nil
+	return resp, o, nil, nil, nil, nil
 }
 
 func ExecuteProcessorBlock(block *gabs.Container) {

l2lsp/methods/lsp_code_generation.go

@@ -12,8 +12,8 @@ import (
 )
 
 func CodeGeneration(req request.JSONRPCRequest) response.JSONRPCResponse {
-	filePath:= req.Params.FilePath
-	Language:= req.Params.Language
+	filePath := req.Params.FilePath
+	Language := req.Params.Language
 	client := req.Params.Client
 	generatedCode, err := ProcessCodeGeneration(filePath, Language, client)
 	if err != nil {
@@ -40,8 +40,6 @@ func ProcessCodeGeneration(filePath, Language, client string) (string, error) {
 		return "", e
 	}
 	generatedCode := codegen.GenerateTargetCode(languageMethod, parsedAPI)
-	
-	return generatedCode, nil
-
 
-}
+	return generatedCode, nil
+}

l2lsp/methods/lsp_execute.go

@@ -59,4 +59,4 @@ func ProcessForLSP(filePath string) (*gabs.Container, error) {
 	}
 
 	return jsonResponse, nil
-}
+}