Revert "remove go ABI for now" (#65)

* Revert "remove go ABI for now (#26)"

This reverts commit b4fc035.

* Update README.md

* ln upgrade, cleanups

* remove this broken test for now

* internal/abi/wasmgo: update, support go 1.12.x

* update xena/wasm-rust-tools

* fix build

* use modules

* oh no

* cwa/tests/olintest/http: ping christine.website instead of printerfacts

* fix travis better

* internal/abi/wasmgo: rip out dagger, add CWA

* enable go for cmd/cwa

* cmd/cwa: support running go modules

* final fixes

* remove last unused function

* fix build

Author: Xe

.travis.yml

@@ -1,5 +1,8 @@
 sudo: required
 
+env:
+  - GOPROXY=https://cache.greedo.xeserv.us GO111MODULE=on
+
 services:
   - docker
 
@@ -8,4 +11,4 @@ language: go
 go: 
  - "1.x"
 
-script: docker build .
+script: docker build --no-cache .

Dockerfile

@@ -14,14 +14,16 @@ RUN wasm-gc ./olinfetch.wasm \
  && wasm-gc ./cwa-tests.wasm \
  && du -hs ./*.wasm
 
-FROM xena/go:1.11.2 AS go
+FROM xena/go:1.12.1 AS go
 RUN apk add --no-cache build-base
-COPY . /root/go/src/github.com/Xe/olin
-WORKDIR /root/go/src/github.com/Xe/olin
+ENV GOPROXY https://cache.greedo.xeserv.us
+WORKDIR /olin
+COPY . .
 COPY --from=rust-wasm-tools /olin/cwagi.wasm ./cmd/cwa-cgi/testdata/test.wasm
 COPY --from=rust-wasm-tools /olin/cwa-tests.wasm ./cmd/cwa/testdata/test.wasm
+RUN GOARCH=wasm GOOS=js go build -o ./cmd/cwa/testdata/go.wasm ./internal/abi/wasmgo/testdata/nothing.go
 RUN go test -v ./cmd/... ./internal/...
-RUN GOBIN=/usr/local/bin go install -tags heroku ./cmd/cwa-cgi
+RUN GOBIN=/usr/local/bin go install ./cmd/cwa-cgi
 RUN GOBIN=/usr/local/bin go install ./cmd/cwa
 
 FROM xena/alpine

README.md

@@ -72,6 +72,47 @@ extern int write(int fd, void *buf, int nbyte);
 extern int sync(int fd);
 ```
 
+### Go
+
+Olin also includes support for running webassembly modules created by [Go 1.12's webassembly support](https://golang.org/wiki/WebAssembly).
+It uses [the `wasmgo` ABI][wasmgo] package in order to do things. Right now
+this is incredibly basic, but should be extendable to more things in the future.
+
+As an example:
+
+```go
+// +build js,wasm ignore
+// hello_world.go
+
+package main
+
+func main() {
+	println("Hello, world!")
+}
+```
+
+when compiled like this:
+
+```console
+$ GOARCH=wasm GOOS=js go1.12.1 build -o hello_world.wasm hello_world.go
+```
+
+produces the following output when run with the testing shim:
+
+```
+=== RUN   TestWasmGo/github.com/Xe/olin/internal/abi/wasmgo.testHelloWorld
+Hello, world!
+--- PASS: TestWasmGo (1.66s)
+    --- PASS: TestWasmGo/github.com/Xe/olin/internal/abi/wasmgo.testHelloWorld (1.66s)
+```
+
+Currently Go binaries cannot interface with the Dagger ABI. There is [an issue](https://github.com/Xe/olin/issues/5)
+open to track the solution to this.
+
+Future posts will include more detail about using Go on top of Olin. 
+
+Under the hood, the Olin implementation of the Go ABI currently uses Dagger.
+
 ## Project Meta
 
 To follow the project, check it on GitHub [here][olin]. To talk about it on Slack,

cmd/cwa-cgi/heroku.go

@@ -9,9 +9,9 @@ import (
 	"net/http"
 	"os"
 
-	"github.com/Xe/ln"
-	"github.com/Xe/ln/opname"
 	"github.com/Xe/olin/internal/cwagi"
+	"within.website/ln"
+	"within.website/ln/opname"
 )
 
 var (

cmd/cwa-cgi/main.go

@@ -13,12 +13,12 @@ import (
 	"testing"
 	"time"
 
-	"github.com/Xe/ln"
-	"github.com/Xe/ln/opname"
 	"github.com/Xe/olin/internal/abi/cwa"
 	"github.com/pborman/uuid"
 	"github.com/perlin-network/life/compiler"
 	"github.com/perlin-network/life/exec"
+	"within.website/ln"
+	"within.website/ln/opname"
 )
 
 type vmServer struct {

cmd/cwa-cgi/main_test.go

@@ -11,6 +11,7 @@ import (
 	"time"
 
 	"github.com/Xe/olin/internal/abi/cwa"
+	"github.com/Xe/olin/internal/abi/wasmgo"
 	"github.com/perlin-network/life/compiler"
 	"github.com/perlin-network/life/exec"
 )
@@ -22,6 +23,7 @@ var (
 	doTest     = flag.Bool("test", false, "unit testing?")
 	vmStats    = flag.Bool("vm-stats", false, "dump VM statistics?")
 	gas        = flag.Int("gas", 65536*64, "number of instructions the VM can perform")
+	goMode     = flag.Bool("go", false, "run in Go mode?")
 )
 
 func init() {
@@ -71,7 +73,7 @@ func main() {
 		}
 	}
 
-	p := cwa.NewProcess(fname, argv, environment)
+	p := wasmgo.New(fname, argv, environment)
 
 	if *doTest {
 		p.Stdin = bytes.NewBuffer([]byte("cwa test environment"))
@@ -90,39 +92,81 @@ func main() {
 		log.Fatalf("%s: %v", fname, err)
 	}
 
+	var ret int32
+	if *goMode {
+		ret, err = runGo(p, vm)
+	} else {
+		ret, err = runCWA(p.Process, vm)
+	}
+	vmRunTime := time.Since(t0)
+	if err != nil {
+		log.Fatalf("%s: vm error: %v", fname, err)
+	}
+	if *vmStats || *doTest {
+		log.Printf("reading file time: %s", readingFileTime)
+		log.Printf("vm init time:      %s", vmInitTime)
+		log.Printf("vm gas limit:      %v", *gas)
+		log.Printf("vm gas used:       %v", vm.Gas)
+		log.Printf("vm gas percentage: %v", float64(float64(vm.Gas) / float64(*gas)))
+		log.Printf("execution time:    %s", vmRunTime)
+	}
+
+	if ret != 0 {
+		log.Fatalf("%s: exit status %d", fname, ret)
+	}
+
+	if *vmStats {
+		log.Printf("memory pages:      %d", len(vm.Memory)/65536)
+	}
+
+	os.Exit(int(ret))
+}
+
+func runCWA(p *cwa.Process, vm *exec.VirtualMachine) (int32, error) {
 	if *doTest {
 		log.Printf("loading function %s", *mainFunc)
 	}
 
 	main, ok := vm.GetFunctionExport(*mainFunc)
 	if !ok {
-		log.Fatalf("%s: no main function exported", fname)
+		return -1, fmt.Errorf("%s: no main function exported", p.Name())
 	}
 
 	if *doTest {
 		log.Printf("executing %s (%d)", *mainFunc, main)
 	}
 
-	t0 = time.Now()
 	ret, err := vm.RunWithGasLimit(main, *gas)
-	vmRunTime := time.Since(t0)
 	if err != nil {
-		log.Fatalf("%s: vm error: %v", fname, err)
+		return 1, err
 	}
-	if *vmStats || *doTest {
-		log.Printf("reading file time: %s", readingFileTime)
-		log.Printf("vm init time: %s", vmInitTime)
-		log.Printf("vm gas used: %v", vm.Gas)
-		log.Printf("execution time: %s", vmRunTime)
+
+	return int32(ret), nil
+}
+
+func runGo(w *wasmgo.WasmGo, vm *exec.VirtualMachine) (int32, error) {
+	log.Printf("starting wasmgo...")
+	w.Memory.Data = vm.Memory
+
+	run, ok := vm.GetFunctionExport("run")
+	if !ok {
+		panic("function not found: run")
 	}
 
-	if ret != 0 {
-		log.Fatalf("%s: exit status %d", fname, ret)
+	resume, ok := vm.GetFunctionExport("resume")
+	if !ok {
+		panic("function not found: resume")
 	}
 
-	if *vmStats {
-		log.Printf("memory pages: %d", len(vm.Memory)/65536)
+	if _, err := vm.RunWithGasLimit(run, *gas, 0, 0); err != nil {
+		return 1, err
 	}
 
-	os.Exit(int(ret))
+	for !vm.Exited {
+		if _, err := vm.RunWithGasLimit(resume, *gas); err != nil {
+			return w.StatusCode, err
+		}
+	}
+
+	return w.StatusCode, nil
 }

cmd/cwa/main.go

@@ -1,3 +1,7 @@
 #!/bin/sh
 
+set -e
+set -x
+
 go run main.go -vm-stats -test -main-func cwa_main ./testdata/test.wasm foo bar
+go run main.go -vm-stats -test -go ./testdata/go.wasm foo bar

cmd/cwa/test.sh

@@ -19,4 +19,4 @@ path = "src/bin/olinfetch.rs"
 chrono = "0.4"
 http = "0.1"
 httparse = "1.3.2"
-wee_alloc = "0.4"
+wee_alloc = "0.4.3"

cwa/olin/Cargo.toml

@@ -18,15 +18,15 @@ pub extern "C" fn cwa_main() -> i32 {
             1
         }).unwrap();
 
-    write!(out, "CPU:\t\t{}\n", "wasm32");
+    write!(out, "CPU:\t\t{}\n", "wasm32").unwrap();
     write!(
         out,
         "Runtime:\t{} {}.{}\n",
         runtime_name,
         runtime::spec_major(),
         runtime::spec_minor()
-    );
-    write!(out, "Now:\t\t{}\n", time::now().to_rfc3339());
+    ).unwrap();
+    write!(out, "Now:\t\t{}\n", time::now().to_rfc3339()).unwrap();
 
     0
 }

cwa/olin/src/bin/olinfetch.rs

@@ -11,6 +11,8 @@ mod scheme;
 pub extern "C" fn cwa_main() -> i32 {
     olin::panic::set_hook();
 
+    let mut fail_count = 0;
+
     let funcs = [
         ns::env::test,
         ns::random::test,
@@ -33,11 +35,14 @@ pub extern "C" fn cwa_main() -> i32 {
     for func in &funcs {
         match func() {
             Ok(()) => {}
-            Err(e) => return e as i32,
+            Err(e) => {
+                olin::log::error(&format!("test error: {:?}", e));
+                fail_count += 1;
+            },
         }
     }
 
-    0
+    fail_count
 }
 
 fn main() {}

cwa/tests/src/main.rs

@@ -11,8 +11,8 @@ pub extern "C" fn test() -> Result<(), i32> {
     let mut resp_body = Vec::<u8>::new();
     let mut req_body = Vec::<u8>::new();
     let req = http::Request::builder()
-        .uri("https://printerfacts.herokuapp.com")
-        .header("User-Agent", "my-awesome-agent/1.0")
+        .uri("http://bsnk.minipaas.xeserv.us")
+        .header("User-Agent", "Olin/dev")
         .body(&mut req_body)
         .map_err(|e| {
             log::error(&format!("request error: {:?}", e));

cwa/tests/src/olintest/http.rs

@@ -0,0 +1,2 @@
+// Package dagger is a runtime library for programs run on dagger.
+package dagger

dagger/doc.go

@@ -0,0 +1,29 @@
+// +build js,wasm go1.12
+
+package dagger
+
+import (
+	"errors"
+	"strconv"
+)
+
+func OpenFile(furl string, flags int32) int32 {
+	return openFD(furl, flags)
+}
+
+func openFD(furl string, flags int32) int32
+
+type file struct {
+	fd int
+}
+
+func read(fd int, buf []byte) int
+
+func (f file) Read(buf []byte) (int, error) {
+	n := read(f.fd, buf)
+	if n < 0 {
+		return n, errors.New("dagger: error code " + strconv.Itoa(n*-1))
+	}
+
+	return n, nil
+}

dagger/file_js.go

@@ -0,0 +1,12 @@
+#include "textflag.h"
+
+// +build js,wasm go1.11
+
+TEXT ·openFD(SB), NOSPLIT, $0
+  CallImport
+  RET
+
+TEXT ·read(SB), NOSPLIT, $0
+  CallImport
+  RET
+  

dagger/file_js.s

@@ -1,11 +1,10 @@
 module github.com/Xe/olin
 
-replace github.com/go-interpreter/wagon v0.0.0 => github.com/losfair/wagon v0.0.0-20180825141017-f8cb99b55a39
+replace github.com/go-interpreter/wagon v0.0.0 => github.com/perlin-network/wagon v0.3.1-0.20180825141017-f8cb99b55a39
 
 require (
-	github.com/Xe/ln v0.1.2
 	github.com/google/uuid v1.0.0 // indirect
-	github.com/heroku/x v0.0.0-20180719221634-1de401e1ba0e
 	github.com/pborman/uuid v0.0.0-20180906182336-adf5a7427709
-	github.com/perlin-network/life v0.0.0-20181005150058-1eb3d14cb6e7
+	github.com/perlin-network/life v0.0.0-20190204091834-d05763d11050
+	within.website/ln v0.5.2
 )