-
Notifications
You must be signed in to change notification settings - Fork 4
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
PROP - 42 - Add External Wasm Runtime #46
Open
rodneyosodo
wants to merge
9
commits into
absmach:main
Choose a base branch
from
rodneyosodo:PROP-42
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
120864d
feat(examples): add long process example and with no input
rodneyosodo d2abc2a
chore(gomod): update packages
rodneyosodo 562b80e
feat: enable external wasm runtime
rodneyosodo 30a493a
fix: use filepath rather than concatenation
rodneyosodo 593e3b4
fix(task): add error to task if the task fails
rodneyosodo 5dca464
chore(ci): add tinygo installtion
rodneyosodo 0206fe4
fix: seperate host and wazero runtime
rodneyosodo e880343
fix: use switch case for assigning runtime based on external runtime
rodneyosodo 3960ea8
fix: use default for catch all
rodneyosodo File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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,27 @@ | ||
| package main | ||
|
|
||
| import "math" | ||
|
|
||
| //export compute | ||
| func compute(n uint32) uint32 { | ||
| var result uint32 | ||
|
|
||
| for i := range n { | ||
| for j := range n { | ||
| for k := range n { | ||
| for l := range n { | ||
| for m := range n { | ||
| // Do some meaningless but CPU-intensive math | ||
| result += uint32(math.Pow(float64(i*j*k*l*m), 2)) % 10 | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| return result | ||
| } | ||
|
|
||
| // main is required for the `wasi` target, even if it isn't used. | ||
| // See https://wazero.io/languages/tinygo/#why-do-i-have-to-define-main | ||
| func main() {} |
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,7 @@ | ||
| package main | ||
|
|
||
| import "fmt" | ||
|
|
||
| func main() { | ||
| fmt.Println("Hello World!") | ||
| } |
This file was deleted.
Oops, something went wrong.
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
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,12 @@ | ||
| package proplet | ||
|
|
||
| import ( | ||
| "context" | ||
| ) | ||
|
|
||
| var ResultsTopic = "channels/%s/messages/control/proplet/results" | ||
|
|
||
| type Runtime interface { | ||
| StartApp(ctx context.Context, wasmBinary []byte, cliArgs []string, id, functionName string, args ...uint64) error | ||
| StopApp(ctx context.Context, id string) error | ||
| } |
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,98 @@ | ||
| package runtimes | ||
|
|
||
| import ( | ||
| "bytes" | ||
| "context" | ||
| "fmt" | ||
| "log/slog" | ||
| "os" | ||
| "os/exec" | ||
| "path/filepath" | ||
| "strconv" | ||
|
|
||
| "github.com/absmach/propeller/pkg/mqtt" | ||
| "github.com/absmach/propeller/proplet" | ||
| ) | ||
|
|
||
| type hostRuntime struct { | ||
| pubsub mqtt.PubSub | ||
| channelID string | ||
| logger *slog.Logger | ||
| wasmRuntime string | ||
| } | ||
|
|
||
| func NewHostRuntime(logger *slog.Logger, pubsub mqtt.PubSub, channelID, wasmRuntime string) proplet.Runtime { | ||
| return &hostRuntime{ | ||
| pubsub: pubsub, | ||
| channelID: channelID, | ||
| logger: logger, | ||
| wasmRuntime: wasmRuntime, | ||
| } | ||
| } | ||
|
|
||
| func (w *hostRuntime) StartApp(ctx context.Context, wasmBinary []byte, cliArgs []string, id, functionName string, args ...uint64) error { | ||
| currentDir, err := os.Getwd() | ||
| if err != nil { | ||
| return fmt.Errorf("error getting current directory: %w", err) | ||
| } | ||
| f, err := os.Create(filepath.Join(currentDir, id+".wasm")) | ||
| if err != nil { | ||
| return fmt.Errorf("error creating file: %w", err) | ||
| } | ||
|
|
||
| if _, err = f.Write(wasmBinary); err != nil { | ||
| return fmt.Errorf("error writing to file: %w", err) | ||
| } | ||
| if err := f.Close(); err != nil { | ||
| return fmt.Errorf("error closing file: %w", err) | ||
| } | ||
|
|
||
| cliArgs = append(cliArgs, filepath.Join(currentDir, id+".wasm")) | ||
| for i := range args { | ||
| cliArgs = append(cliArgs, strconv.FormatUint(args[i], 10)) | ||
| } | ||
| cmd := exec.Command(w.wasmRuntime, cliArgs...) | ||
| results := bytes.Buffer{} | ||
| cmd.Stdout = &results | ||
|
|
||
| if err := cmd.Start(); err != nil { | ||
| return fmt.Errorf("error starting command: %w", err) | ||
| } | ||
|
|
||
| go func(fileName string) { | ||
| var payload map[string]interface{} | ||
|
|
||
| if err := cmd.Wait(); err != nil { | ||
| w.logger.Error("failed to wait for command", slog.String("id", id), slog.String("error", err.Error())) | ||
| payload = map[string]interface{}{ | ||
| "task_id": id, | ||
| "error": err.Error(), | ||
| "results": results.String(), | ||
| } | ||
| } else { | ||
| payload = map[string]interface{}{ | ||
| "task_id": id, | ||
| "results": results.String(), | ||
| } | ||
| } | ||
|
|
||
| topic := fmt.Sprintf(proplet.ResultsTopic, w.channelID) | ||
| if err := w.pubsub.Publish(ctx, topic, payload); err != nil { | ||
| w.logger.Error("failed to publish results", slog.String("id", id), slog.String("error", err.Error())) | ||
|
|
||
| return | ||
| } | ||
|
|
||
| if err := os.Remove(fileName); err != nil { | ||
| w.logger.Error("failed to remove file", slog.String("fileName", fileName), slog.String("error", err.Error())) | ||
| } | ||
|
|
||
| w.logger.Info("Finished running app", slog.String("id", id)) | ||
| }(filepath.Join(currentDir, id+".wasm")) | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func (w *hostRuntime) StopApp(ctx context.Context, id string) error { | ||
| return nil | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I prefer doing it with
if-else, then re-assigning and calling New two times in the worst case. It documents better the intention.