Merge pull request #183 from suborbital/jagger/tinygo-api-refactor

Refactor TinyGo API into separate packages

.github/workflows/sanity.yml

@@ -44,11 +44,14 @@ jobs:
       - name: Run test
         run: |
           export GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}
-          go test -v ./...
+          make test
 
       - name: Run test with Wasmtime
         run: |
           export GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}
+<<<<<<< HEAD
+          make test/multi
+=======
           go test -v --tags wasmtime ./...
 
       - name: Install WasmEdge
@@ -60,3 +63,4 @@ jobs:
           export GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}
           source $HOME/.wasmedge/env
           go test -v --tags wasmedge ./...
+>>>>>>> origin

Makefile

@@ -33,4 +33,4 @@ deps:
 deps/wasmedge:
 	wget -qO- https://raw.githubusercontent.com/WasmEdge/WasmEdge/master/utils/install.sh | bash -s -- -v 0.9.0-rc.5
 
-.PHONY: test test/wasmtime test/wasmedge test/multi testdata crate/publish deps deps/wasmedge
+.PHONY: test test/wasmtime test/wasmedge test/multi testdata crate/publish deps deps/wasmedge

api/tinygo/runnable/cache/cache.go

@@ -0,0 +1,13 @@
+package cache
+
+import (
+	"github.com/suborbital/reactr/api/tinygo/runnable/internal/ffi"
+)
+
+func Get(key string) ([]byte, error) {
+	return ffi.CacheGet(key)
+}
+
+func Set(key, val string, ttl int) {
+	ffi.CacheSet(key, val, ttl)
+}

api/tinygo/runnable/http.go → api/tinygo/runnable/http/http.go

@@ -1,44 +1,44 @@
 //go:build tinygo.wasm
 
-package runnable
+package http
 
-// #include <reactr.h>
-import "C"
 import (
-	"github.com/suborbital/reactr/api/tinygo/runnable/method"
+	"github.com/suborbital/reactr/api/tinygo/runnable/internal/ffi"
+
+	"github.com/suborbital/reactr/api/tinygo/runnable/http/method"
 )
 
 func GET(url string, headers map[string]string) ([]byte, error) {
-	return doRequest(method.GET, url, nil, headers)
+	return do(method.GET, url, nil, headers)
 }
 
 func HEAD(url string, headers map[string]string) ([]byte, error) {
-	return doRequest(method.HEAD, url, nil, headers)
+	return do(method.HEAD, url, nil, headers)
 }
 
 func OPTIONS(url string, headers map[string]string) ([]byte, error) {
-	return doRequest(method.OPTIONS, url, nil, headers)
+	return do(method.OPTIONS, url, nil, headers)
 }
 
 func POST(url string, body []byte, headers map[string]string) ([]byte, error) {
-	return doRequest(method.POST, url, body, headers)
+	return do(method.POST, url, body, headers)
 }
 
 func PUT(url string, body []byte, headers map[string]string) ([]byte, error) {
-	return doRequest(method.PUT, url, body, headers)
+	return do(method.PUT, url, body, headers)
 }
 
 func PATCH(url string, body []byte, headers map[string]string) ([]byte, error) {
-	return doRequest(method.PATCH, url, body, headers)
+	return do(method.PATCH, url, body, headers)
 }
 
 func DELETE(url string, headers map[string]string) ([]byte, error) {
-	return doRequest(method.DELETE, url, nil, headers)
+	return do(method.DELETE, url, nil, headers)
 }
 
 // Remark: The URL gets encoded with headers added on the end, seperated by ::
 // eg. https://google.com/somepage::authorization:bearer qdouwrnvgoquwnrg::anotherheader:nicetomeetyou
-func doRequest(method method.MethodType, url string, body []byte, headers map[string]string) ([]byte, error) {
+func do(method method.MethodType, url string, body []byte, headers map[string]string) ([]byte, error) {
 	urlStr := url
 
 	if headers != nil {
@@ -48,12 +48,7 @@ func doRequest(method method.MethodType, url string, body []byte, headers map[st
 		}
 	}
 
-	urlPtr, urlSize := rawSlicePointer([]byte(urlStr))
-	bodyPtr, bodySize := rawSlicePointer(body)
-
-	size := C.fetch_url(int32(method), urlPtr, urlSize, bodyPtr, bodySize, ident())
-
-	return result(size)
+	return ffi.DoHTTPRequest(int32(method), urlStr, body, headers)
 }
 
 func renderHeaderString(headers map[string]string) string {

api/tinygo/runnable/cache.go → api/tinygo/runnable/internal/ffi/cache.go

@@ -1,20 +1,20 @@
 //go:build tinygo.wasm
 
-package runnable
+package ffi
 
 // #include <reactr.h>
 import "C"
 
 func CacheGet(key string) ([]byte, error) {
 	ptr, size := rawSlicePointer([]byte(key))
 
-	return result(C.cache_get(ptr, size, ident()))
+	return result(C.cache_get(ptr, size, Ident()))
 }
 
 func CacheSet(key, val string, ttl int) {
 	keyPtr, keySize := rawSlicePointer([]byte(key))
 	valPtr, valSize := rawSlicePointer([]byte(val))
 
-	C.cache_set(keyPtr, keySize, valPtr, valSize, int32(ttl), ident())
+	C.cache_set(keyPtr, keySize, valPtr, valSize, int32(ttl), Ident())
 	return
 }

api/tinygo/runnable/internal/ffi/globals.go

@@ -0,0 +1,18 @@
+//go:build tinygo.wasm
+
+package ffi
+
+import (
+	"github.com/suborbital/reactr/api/tinygo/runnable/runnable"
+)
+
+var runnable_ runnable.Runnable
+var ident_ int32
+
+func Ident() int32 {
+	return ident_
+}
+
+func Use(runnable runnable.Runnable) {
+	runnable_ = runnable
+}

api/tinygo/runnable/internal/ffi/http.go

@@ -0,0 +1,15 @@
+//go:build tinygo.wasm
+
+package ffi
+
+// #include <reactr.h>
+import "C"
+
+func DoHTTPRequest(method int32, urlStr string, body []byte, headers map[string]string) ([]byte, error) {
+	urlPtr, urlSize := rawSlicePointer([]byte(urlStr))
+	bodyPtr, bodySize := rawSlicePointer(body)
+
+	size := C.fetch_url(method, urlPtr, urlSize, bodyPtr, bodySize, Ident())
+
+	return result(size)
+}

api/tinygo/runnable/internal/ffi/log.go

@@ -0,0 +1,12 @@
+//go:build tinygo.wasm
+
+package ffi
+
+// #include <reactr.h>
+import "C"
+
+func LogAtLevel(message string, level int32) {
+	msgPtr, size := rawSlicePointer([]byte(message))
+
+	C.log_msg(msgPtr, size, level, Ident())
+}

api/tinygo/runnable/internal/ffi/req.go

@@ -0,0 +1,23 @@
+//go:build tinygo.wasm
+
+package ffi
+
+// #include <reactr.h>
+import "C"
+
+func ReqGetField(fieldType int32, key string) []byte {
+	ptr, size := rawSlicePointer([]byte(key))
+
+	res, err := result(C.request_get_field(fieldType, ptr, size, Ident()))
+	if err != nil {
+		return []byte{}
+	}
+	return res
+}
+
+func ReqSetField(fieldType int32, key string, value string) ([]byte, error) {
+	keyPtr, keySize := rawSlicePointer([]byte(key))
+	valPtr, valSize := rawSlicePointer([]byte(value))
+
+	return result(C.request_set_field(fieldType, keyPtr, keySize, valPtr, valSize, Ident()))
+}

api/tinygo/runnable/internal/ffi/result.go

@@ -0,0 +1,34 @@
+//go:build tinygo.wasm
+
+package ffi
+
+// #include <reactr.h>
+import "C"
+import (
+	"github.com/suborbital/reactr/api/tinygo/runnable/runnable"
+)
+
+func result(size int32) ([]byte, runnable.HostErr) {
+	allocSize := size
+
+	if size < 0 {
+		if size == -1 {
+			return nil, runnable.NewHostError("unknown error returned from host")
+		}
+
+		allocSize = -size
+	}
+
+	result := make([]byte, allocSize)
+	resultPtr, _ := rawSlicePointer(result)
+
+	if code := C.get_ffi_result(resultPtr, Ident()); code != 0 {
+		return nil, runnable.NewHostError("unknown error returned from host")
+	}
+
+	if size < 0 {
+		return nil, runnable.NewHostError(string(result))
+	}
+
+	return result, nil
+}

api/tinygo/runnable/runnable_extern.go → api/tinygo/runnable/internal/ffi/run.go

@@ -1,20 +1,15 @@
 //go:build tinygo.wasm
 
-package runnable
+package ffi
 
 // #include <reactr.h>
 import "C"
 import (
 	"reflect"
 	"unsafe"
-)
-
-var runnable_ Runnable
-var ident_ int32
 
-func ident() int32 {
-	return ident_
-}
+	"github.com/suborbital/reactr/api/tinygo/runnable/runnable"
+)
 
 //export run_e
 func run_e(rawdata uintptr, size int32, ident int32) {
@@ -47,7 +42,7 @@ func returnError(err error, ident int32) {
 	}
 
 	switch e := err.(type) {
-	case RunErr:
+	case runnable.RunErr:
 		code = int32(e.Code)
 	}
 

api/tinygo/runnable/alloc.go → api/tinygo/runnable/internal/ffi/unsafe.go

@@ -1,6 +1,6 @@
 //go:build tinygo.wasm
 
-package runnable
+package ffi
 
 import (
 	"reflect"

api/tinygo/runnable/log.go → api/tinygo/runnable/log/log.go

@@ -1,21 +1,19 @@
 //go:build tinygo.wasm
 
-package runnable
+package log
 
-// #include <reactr.h>
-import "C"
 import (
 	"fmt"
+
+	"github.com/suborbital/reactr/api/tinygo/runnable/internal/ffi"
 )
 
-func logAtLevel(message string, level LogLevel) {
-	msgPtr, size := rawSlicePointer([]byte(message))
+type LogLevel int32
 
-	C.log_msg(msgPtr, size, int32(level), ident())
+func logAtLevel(message string, level LogLevel) {
+	ffi.LogAtLevel(message, int32(level))
 }
 
-type LogLevel int32
-
 const (
 	LogLevelError LogLevel = iota + 1
 	LogLevelWarn

api/tinygo/runnable/req.go → api/tinygo/runnable/req/req.go

@@ -1,9 +1,10 @@
 //go:build tinygo.wasm
 
-package runnable
+package req
 
-// #include <reactr.h>
-import "C"
+import (
+	"github.com/suborbital/reactr/api/tinygo/runnable/internal/ffi"
+)
 
 type FieldType int32
 
@@ -16,20 +17,11 @@ const (
 )
 
 func getField(fieldType FieldType, key string) []byte {
-	ptr, size := rawSlicePointer([]byte(key))
-
-	res, err := result(C.request_get_field(int32(fieldType), ptr, size, ident()))
-	if err != nil {
-		return []byte{}
-	}
-	return res
+	return ffi.ReqGetField(int32(fieldType), key)
 }
 
 func setField(fieldType FieldType, key string, value string) ([]byte, error) {
-	keyPtr, keySize := rawSlicePointer([]byte(key))
-	valPtr, valSize := rawSlicePointer([]byte(value))
-
-	return result(C.request_set_field(int32(fieldType), keyPtr, keySize, valPtr, valSize, ident()))
+	return ffi.ReqSetField(int32(fieldType), key, value)
 }
 
 func Method() string {