Skip to content

Wasm integration #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 86 commits into from
Sep 1, 2024
Merged

Wasm integration #47

merged 86 commits into from
Sep 1, 2024

Conversation

rogueloop
Copy link
Contributor

@rogueloop rogueloop commented May 11, 2024

What type of MR is this? (check all applicable)

  • [ x] 🍕 Feature

Web assembly integration for Lama2.

Modifying Golang to add support for building web assembly binary.

Important files to start review from in the order

  1. controller.cli.go

  2. Controller.wasm.go

  3. controller.go

other major changes :

  • makefile
# Build command for normal cli builds
go build -tags=cli -o build/l2 -ldflags "-X main.version=$(git tag --sort=-version:refname | head -n 1) -X main.lamawasm=cli " l2.go

# Build command for wasm builds
GOOS=js GOARCH=wasm go build -o build/l2.wasm -tags=wasm -ldflags "-X main.version=$(git tag --sort=-version:refname | head -n 1) -X main.lamawasm=lamawasm " l2.wasm.go

@@ -16,11 +16,11 @@ jobs:
- name: Install dependencies
run: go mod tidy
- name: Build
run: go build -v ./...
run: go build -tags=cli -v ./...
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this done only for ones with tag cli, are there any other tags

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes there is wasm tag also currently build is failing , checking that now

cmdgen/cmdgen.go Outdated
Comment on lines 58 to 59
keyValuePair := fmt.Sprintf("%s=%s", key, val.Data().(string))
command = append(command, keyValuePair)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are these changes tested?

// TODO - replace stuff in headers, and varjson and json as well
cmd, stdinBody := cmdgen.ConstructCommand(block)
resp, e1 := cmdexec.ExecCommand(cmd, stdinBody)
printFields(resp)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What does this do

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added it for debugging purpose, printing the response

l2.wasm.go Outdated
Comment on lines 24 to 26
js.Global().Set("lama2Wasm", js.FuncOf(lama2Wasm))
js.Global().Set("goWebRequestFunc", wasmLamaPromise())
select {}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can add a comment on what these lines do

l2.wasm.go Outdated

func lama2Wasm(this js.Value, i []js.Value) interface{} {
go func() {
controller.ProcessWasmInput("GET\nhttps://httpbin.org/get")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this for processing the Default request?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That function was for testing purpose , removed

@@ -6,7 +6,7 @@ import (

"github.com/HexmosTech/lama2/l2lsp/request"
"github.com/HexmosTech/lama2/l2lsp/response"
"github.com/rs/zerolog/log"
// "github.com/rs/zerolog/log"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can be removed right

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is for logging purpose


func ExpandHeaders(block *gabs.Container) {
headerMap := block.S("details", "headers")
// log.Info().Str("HeaderMap", headerMap.String()).Msg("")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can remove commented code

@@ -0,0 +1,220 @@
//go:build wasm
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the basic difference in the code between preprocess.wasm.go and preprocess.go

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there is a lot of code repetition there converted it into 3 separate file to remove duplication

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The difference is in function calls , wasm has 1 parameter , cli has 2 params , each of them calls different functions

@rogueloop rogueloop merged commit 73ceef1 into main Sep 1, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants