Wasm integration

.github/workflows/testapp.yml

@@ -16,11 +16,11 @@ jobs:
       - name: Install dependencies
         run: go mod tidy
       - name: Build
-        run: go build -v ./...
+        run: go build -tags=cli -v ./...
       - name: Test with the Go CLI
         run: |
           go mod tidy
-          go build -o build/l2 -ldflags "-X main.version=`git tag --sort=-version:refname | head -n 1`" l2.go
+          go build -tags=cli -o build/l2 -ldflags "-X main.version=`git tag --sort=-version:refname | head -n 1`" l2.go
           go test -v ./tests/
       - name: Deploy hexmos doc
         run: curl -X POST --fail -F token=${{ secrets.TRIGGER_TOKEN }} -F ref=main https://git.apps.hexmos.com/api/v4/projects/85/trigger/pipeline

.gitignore

@@ -1,3 +1,5 @@
 build/
 lama2
 .vscode
+buildAndPublish.sh
+static/

cmdexec/cmdexec.go

@@ -1,3 +1,5 @@
+//go:build cli
+
 // Package `cmdexec` provides a facility to execute
 // l2 commands, stream output to stdout, while also
 // providing ability to retrieve the command output as

cmdexec/cmdexec.wasm.go

@@ -0,0 +1,35 @@
+//go:build wasm
+
+// Package `cmdexec` provides a facility to execute
+// l2 commands, stream output to stdout, while also
+// providing ability to retrieve the command output as
+// a string.
+package cmdexec
+
+import (
+	"errors"
+	"fmt"
+
+	"strings"
+
+	"github.com/HexmosTech/httpie-go"
+)
+
+// ExecCommand changes directory to the given `apiDir`
+// and then executes the command specified in `cmdStr`
+// During command execution, ExecCommand streams output
+// to stdout.
+// Once execution finishes, previous CWD is restored,
+// and the command output is returned as a string
+func ExecCommand(cmdSlice []string, stdinBody string) (httpie.ExResponse, error) {
+	proxyURL := "https://proxyserver.hexmos.com/"	
+	proxyUserName := "proxyServer"
+	proxyUserPassword := "proxy22523146server"
+	allowRedirects := true
+	resp, err := httpie.Lama2Entry(cmdSlice, strings.NewReader(stdinBody), proxyURL, proxyUserName, proxyUserPassword, allowRedirects)
+	if err != nil {
+		fmt.Println("Got error while executing", err)
+		return httpie.ExResponse{}, errors.New("Error from API executor: " + err.Error())
+	}
+	return resp, nil
+}

cmdexec/js.go

@@ -1,3 +1,5 @@
+//go:build cli
+
 package cmdexec
 
 import (

cmdexec/js.wasm.go

@@ -0,0 +1,23 @@
+//go:build wasm
+
+package cmdexec
+
+import (
+	"syscall/js"
+)
+
+func RunVMCode(jsCode string) {
+	js.Global().Call("eval", jsCode)
+}
+
+func GenerateChainCode(httpRespBody string) string {
+	code := `try {
+		result = JSON.parse(String.raw` + "`" + httpRespBody + "`" + `)	
+		console.log("Stored as JSON")
+	} catch (e) {
+		result = String.raw` + "`" + httpRespBody + "`" + ` 	
+		console.log(e)
+		console.log("Stored as string")
+	}`
+	return code
+}

cmdgen/cmdgen.go

@@ -1,3 +1,5 @@
+//go:build cli
+
 // Package `cmdgen` provides an API to generate
 // API request commands (by default based on HTTPie)
 // based on the parsed API file contents and the `l2`
@@ -17,35 +19,18 @@ import (
 
 func assembleCmdString(httpv string, url string, jsonObj *gabs.Container, headers *gabs.Container, multipart bool, form bool, o *lama2cmd.Opts) ([]string, string) {
 	command := make([]string, 0)
-	log.Info().
-		Str("Type", "Construct Command").
-		Str("httpv", httpv).
-		Str("url", url).
-		Bool("multipart", multipart).
-		Bool("form", form).
-		Msg(fmt.Sprint("Construct parameters"))
-
-	log.Debug().
-		Str("JSONObj", jsonObj.String()).
-		Str("Headers", headers.String()).Msg("")
-
 	var files *gabs.Container
 	if multipart {
 		if jsonObj.ExistsP("@files") {
 			files = jsonObj.S("@files")
-			log.Debug().Str("Files", files.String()).Msg("")
 			jsonObj.Delete("@files")
-			log.Trace().Str("Shortened JsonObj", jsonObj.String()).Msg("")
 		}
 	}
 
 	jsonStr := ""
 	if jsonObj != nil && !multipart && !form {
 		dst := &bytes.Buffer{}
 		if err := json.Compact(dst, []byte(jsonObj.String())); err != nil {
-			log.Fatal().
-				Str("Error", err.Error()).
-				Msg("Couldn't minify JSON")
 		}
 		jsonStr = dst.String()
 	}
@@ -70,7 +55,8 @@ func assembleCmdString(httpv string, url string, jsonObj *gabs.Container, header
 
 	if multipart {
 		for key, val := range jsonObj.Data().(*gabs.Container).ChildrenMap() {
-			command = append(command, "'"+key+"'='"+val.Data().(string)+"'  ")
+			keyValuePair := fmt.Sprintf("%s=%s", key, val.Data().(string))
+			command = append(command, keyValuePair)
 		}
 		for key, val := range files.ChildrenMap() {
 			command = append(command, key+"@"+val.Data().(string))
@@ -79,7 +65,7 @@ func assembleCmdString(httpv string, url string, jsonObj *gabs.Container, header
 
 	if form {
 		for key, val := range jsonObj.Data().(*gabs.Container).ChildrenMap() {
-			keyValuePair := fmt.Sprintf("'%s'='%s'  ", key, val.Data().(string))
+			keyValuePair := fmt.Sprintf("%s=%s", key, val.Data().(string))
 			command = append(command, keyValuePair)
 		}
 	}

cmdgen/cmdgen.wasm.go

@@ -0,0 +1,87 @@
+//go:build wasm
+
+package cmdgen
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"strings"
+
+	"github.com/HexmosTech/gabs/v2"
+)
+
+func assembleCmdString(httpv string, url string, jsonObj *gabs.Container, headers *gabs.Container, multipart bool, form bool) ([]string, string) {
+	command := make([]string, 0)
+	var files *gabs.Container
+	if multipart {
+		if jsonObj.ExistsP("@files") {
+			files = jsonObj.S("@files")
+			jsonObj.Delete("@files")
+		}
+	}
+
+	jsonStr := ""
+	if jsonObj != nil && !multipart && !form {
+		dst := &bytes.Buffer{}
+		if err := json.Compact(dst, []byte(jsonObj.String())); err != nil {
+		}
+		jsonStr = dst.String()
+	}
+
+	command = append(command, "ht ")
+	if multipart || form {
+		command = append(command, "--ignore-stdin", "--form")
+	}
+
+	command = append(command, httpv+" ")
+	command = append(command, url+" ")
+
+	if multipart {
+		for key, val := range jsonObj.Data().(*gabs.Container).ChildrenMap() {
+			command = append(command, "'"+key+"'='"+val.Data().(string)+"'  ")
+		}
+		for key, val := range files.ChildrenMap() {
+			command = append(command, key+"@"+val.Data().(string))
+		}
+	}
+
+	if form {
+		for key, val := range jsonObj.Data().(*gabs.Container).ChildrenMap() {
+			keyValuePair := fmt.Sprintf("'%s'='%s'  ", key, val.Data().(string))
+			command = append(command, keyValuePair)
+		}
+	}
+
+	if headers != nil {
+		for key, val := range headers.Data().(*gabs.Container).ChildrenMap() {
+			command = append(command, key+":"+val.Data().(*gabs.Container).Data().(string))
+		}
+	}
+	cleanCommand := make([]string, 0)
+	for _, c := range command {
+		cleanC := strings.TrimSpace(c)
+		cleanCommand = append(cleanCommand, cleanC)
+	}
+	if multipart || form {
+		return cleanCommand, ""
+	}
+	return cleanCommand, jsonStr
+}
+
+func ConstructCommand(parsedInput *gabs.Container) ([]string, string) {
+	httpv := parsedInput.S("verb", "value")
+	url := parsedInput.S("url", "value")
+	jsonObj := parsedInput.S("details", "ip_data")
+	headers := parsedInput.S("details", "headers")
+	multipart := parsedInput.S("multipart", "value")
+	multipartBool := false
+	if multipart != nil {
+		multipartBool = true
+	}
+	form := parsedInput.S("form", "value")
+	formBool := form != nil
+
+	res, stdinBody := assembleCmdString(httpv.Data().(string), url.Data().(string), jsonObj, headers, multipartBool, formBool)
+	return res, stdinBody
+}

codegen/codegen.go

@@ -1,3 +1,5 @@
+//go:wasm cli
+
 package codegen
 
 import (