user logs

cmd/api/main.go

@@ -55,13 +55,13 @@ func main() {
 }
 
 func seedEndpoint(store storage.Store, cache storage.ModCacher) {
-	b, err := os.ReadFile("examples/js/index.js")
+	b, err := os.ReadFile("examples/go/app.wasm")
 	if err != nil {
 		log.Fatal(err)
 	}
 	endpoint := &types.Endpoint{
 		ID:          uuid.MustParse("09248ef6-c401-4601-8928-5964d61f2c61"),
-		Runtime:     "js",
+		Runtime:     "go",
 		Name:        "Catfact parser",
 		Environment: map[string]string{"FOO": "bar"},
 		CreatedAT:   time.Now(),

examples/go/main.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"fmt"
 	"net/http"
 
 	raptor "github.com/anthdm/raptor/sdk"
@@ -20,5 +21,6 @@ func main() {
 	// router := chi.NewMux()
 	// router.Get("/dashboard", handleDashboard)
 	// router.Get("/login", handleLogin)
+	fmt.Println("user log")
 	raptor.Handle(http.HandlerFunc(handleLogin))
 }

examples/js/index.js

@@ -1,23 +1,21 @@
-function generateEndHex(length, status) {
+// This should come from the official SDK. 
+// But there is no official SDK yet, so we keep it here.
+function respond(res, status) {
   var buffer = new ArrayBuffer(8);
   var view = new DataView(buffer);
 
   view.setUint32(0, status, true);
-  view.setUint32(4, length, true);
-
-  var hexString = "";
-  for (var i = 0; i < buffer.byteLength; i++) {
-    var hex = view.getUint8(i).toString(16);
-    hexString += hex.padStart(2, "0");
-  }
+  view.setUint32(4, res.length, true);
 
-  return hexString;
+  var bytes = new Uint8Array(buffer);
+  print(res)
+  print(bytes)
 }
 
-// This should come from the official SDK. 
-// But there is no official SDK yet, so we keep it here.
-function respond(res, status) {
-	putstr(res+generateEndHex(res.length, status))
-}
+console.log("user log here")
+console.log("user log here")
+console.log("user log here")
+console.log("user log here")
+console.log("user log here")
 
 respond("<h1>From my Raptor application</h1></br>some other stuff here</br>", 200)

internal/actrs/runtime.go

@@ -140,7 +140,7 @@ func (r *Runtime) handleHTTPRequest(ctx *actor.Context, msg *proto.HTTPRequest)
 		return
 	}
 
-	res, status, err := shared.ParseRuntimeHTTPResponse(r.stdout.String())
+	_, res, status, err := shared.ParseStdout(r.stdout)
 	if err != nil {
 		respondError(ctx, http.StatusInternalServerError, "invalid response", msg.ID)
 		return

internal/runtime/runtime_test.go

@@ -42,7 +42,7 @@ func TestRuntimeInvokeJSCode(t *testing.T) {
 	scriptArgs := []string{"", "-e", string(b)}
 	require.Nil(t, r.Invoke(bytes.NewReader(breq), nil, scriptArgs...))
 
-	_, status, err := shared.ParseRuntimeHTTPResponse(out.String())
+	_, _, status, err := shared.ParseStdout(out)
 	require.Nil(t, err)
 	require.Equal(t, http.StatusOK, status)
 	require.Nil(t, r.Close())
@@ -71,7 +71,7 @@ func TestRuntimeInvokeGoCode(t *testing.T) {
 	r, err := New(context.Background(), args)
 	require.Nil(t, err)
 	require.Nil(t, r.Invoke(bytes.NewReader(breq), nil))
-	_, status, err := shared.ParseRuntimeHTTPResponse(out.String())
+	_, _, status, err := shared.ParseStdout(out)
 	require.Nil(t, err)
 	require.Equal(t, http.StatusOK, status)
 	require.Nil(t, r.Close())

internal/shared/shared.go

@@ -13,8 +13,33 @@ import (
 	"github.com/anthdm/raptor/proto"
 )
 
+const magicLen = 8
+
 var errInvalidHTTPResponse = errors.New("invalid HTTP response")
 
+func ParseStdout(stdout io.Reader) (logs []byte, resp []byte, status int, err error) {
+	stdoutb, err := io.ReadAll(stdout)
+	if err != nil {
+		return
+	}
+	outLen := len(stdoutb)
+	if outLen < magicLen {
+		err = fmt.Errorf("mallformed HTTP response missing last %d bytes", magicLen)
+		return
+	}
+	magicStart := outLen - magicLen
+	status = int(binary.LittleEndian.Uint32(stdoutb[magicStart : magicStart+4]))
+	respLen := binary.LittleEndian.Uint32(stdoutb[magicStart+4:])
+	if int(respLen) > outLen-magicLen {
+		err = fmt.Errorf("response length exceeds available data")
+		return
+	}
+	respStart := outLen - magicLen - int(respLen)
+	resp = stdoutb[respStart : respStart+int(respLen)]
+	logs = stdoutb[:respStart]
+	return
+}
+
 func ParseRuntimeHTTPResponse(in string) (resp string, status int, err error) {
 	if len(in) < 16 {
 		err = fmt.Errorf("misformed HTTP response missing last 16 bytes")

internal/shared/shared_test.go

@@ -1,27 +1,104 @@
 package shared
 
 import (
+	"bytes"
 	"encoding/binary"
 	"encoding/hex"
 	"fmt"
+	"log"
 	"testing"
 
 	"github.com/stretchr/testify/require"
 )
 
+func BenchmarkParseStdout(b *testing.B) {
+	userResp := "<h1>This is the actual response</h1>"
+	statusCode := uint32(200)
+	userLogs := `
+the big brown fox
+the big brown fox
+the big brown fox
+the big brown fox
+the big brown fox
+`
+	builder := &bytes.Buffer{}
+
+	buf := make([]byte, 8)
+	binary.LittleEndian.PutUint32(buf[0:4], statusCode)
+	binary.LittleEndian.PutUint32(buf[4:8], uint32(len(userResp)))
+
+	b.ResetTimer()
+	b.StartTimer()
+	b.ReportAllocs()
+	for i := 0; i < b.N; i++ {
+		builder.WriteString(userLogs)
+		builder.WriteString(userResp)
+		builder.Write(buf)
+		if _, _, _, err := ParseStdout(builder); err != nil {
+			log.Fatal(err)
+		}
+		builder.Reset()
+	}
+	b.StopTimer()
+}
+
+func TestParseWithoutUserLogs(t *testing.T) {
+	userResp := "<h1>This is the actual response</h1>"
+	statusCode := uint32(200)
+	builder := &bytes.Buffer{}
+	builder.WriteString(userResp)
+
+	// += userResp
+	buf := make([]byte, 8)
+	binary.LittleEndian.PutUint32(buf[0:4], statusCode)
+	binary.LittleEndian.PutUint32(buf[4:8], uint32(len(userResp)))
+	builder.Write(buf)
+
+	logs, resp, status, err := ParseStdout(builder)
+	require.Nil(t, err)
+	require.Equal(t, int(statusCode), status)
+	require.Equal(t, userResp, string(resp))
+	require.Equal(t, []byte{}, logs)
+}
+
+func TestParseWithUserLogs(t *testing.T) {
+	userResp := "<h1>This is the actual response</h1>"
+	statusCode := uint32(200)
+	userLogs := `
+the big brown fox
+the big brown fox
+the big brown fox
+the big brown fox
+the big brown fox
+`
+	builder := &bytes.Buffer{}
+	builder.WriteString(userLogs)
+	builder.WriteString(userResp)
+
+	// += userResp
+	buf := make([]byte, 8)
+	binary.LittleEndian.PutUint32(buf[0:4], statusCode)
+	binary.LittleEndian.PutUint32(buf[4:8], uint32(len(userResp)))
+	builder.Write(buf)
+
+	logs, resp, status, err := ParseStdout(builder)
+	require.Nil(t, err)
+	require.Equal(t, int(statusCode), status)
+	require.Equal(t, userResp, string(resp))
+	require.Equal(t, userLogs, string(logs))
+}
+
 func TestParseRuntimeHTTPResponse(t *testing.T) {
-	t.Run("multiline response", func(t *testing.T) {
-		text := "This is the best.\nBut not always correct.\nThe big brown fox."
-		statusCode := uint32(500)
-
-		buf := make([]byte, 8)
-		binary.LittleEndian.PutUint32(buf[0:4], statusCode)
-		binary.LittleEndian.PutUint32(buf[4:8], uint32(len(text)))
-
-		in := fmt.Sprintf("%s%s", text, hex.EncodeToString(buf))
-		resp, status, err := ParseRuntimeHTTPResponse(in)
-		require.Nil(t, err)
-		require.Equal(t, int(statusCode), status)
-		require.Equal(t, text, resp)
-	})
+	text := "This is the best.\nBut not always correct.\nThe big brown fox."
+	statusCode := uint32(500)
+
+	buf := make([]byte, 8)
+	binary.LittleEndian.PutUint32(buf[0:4], statusCode)
+	binary.LittleEndian.PutUint32(buf[4:8], uint32(len(text)))
+
+	in := fmt.Sprintf("%s%s", text, hex.EncodeToString(buf))
+	resp, status, err := ParseRuntimeHTTPResponse(in)
+	require.Nil(t, err)
+	require.Equal(t, int(statusCode), status)
+	require.Equal(t, text, resp)
 }

sdk/sdk.go

@@ -3,8 +3,6 @@ package run
 import (
 	"bytes"
 	"encoding/binary"
-	"encoding/hex"
-	"fmt"
 	"io"
 	"log"
 	"net/http"
@@ -46,12 +44,12 @@ func Handle(h http.Handler) {
 		r.Header[k] = v.Fields
 	}
 	h.ServeHTTP(w, r) // execute the user's handler
-	fmt.Print(w.buffer.String())
+	os.Stdout.Write(w.buffer.Bytes())
 
 	buf := make([]byte, 8)
 	binary.LittleEndian.PutUint32(buf[0:4], uint32(w.statusCode))
 	binary.LittleEndian.PutUint32(buf[4:8], uint32(w.buffer.Len()))
-	fmt.Print(hex.EncodeToString(buf))
+	os.Stdout.Write(buf)
 }
 
 type ResponseWriter struct {