Revisiting request body processing

api/agent/protocol/json.go

@@ -1,6 +1,7 @@
 package protocol
 
 import (
+	"bytes"
 	"encoding/json"
 	"fmt"
 	"io"
@@ -25,6 +26,23 @@ func (p *JSONProtocol) IsStreamable() bool {
 	return true
 }
 
+type RequestEncoder struct {
+	*json.Encoder
+}
+
+func (re *RequestEncoder) EncodeRequest(rq *http.Request) error {
+	bb := new(bytes.Buffer)
+	_, err := bb.ReadFrom(rq.Body)
+	if err != nil {
+		return err
+	}
+	defer bb.Reset()
+	return re.Encode(JSONIO{
+		Headers: rq.Header,
+		Body:    bb.String(),
+	})
+}
+
 func (h *JSONProtocol) DumpJSON(w io.Writer, req *http.Request) error {
 	_, err := io.WriteString(h.in, `{`)
 	if err != nil {
@@ -68,7 +86,9 @@ func (h *JSONProtocol) DumpJSON(w io.Writer, req *http.Request) error {
 }
 
 func (h *JSONProtocol) Dispatch(w io.Writer, req *http.Request) error {
-	err := h.DumpJSON(w, req)
+	ce := RequestEncoder{json.NewEncoder(h.in)}
+	err := ce.EncodeRequest(req)
+	//err := h.DumpJSON(w, req)
 	if err != nil {
 		return respondWithError(
 			w, fmt.Errorf("unable to write JSON into STDIN: %s", err.Error()))

examples/formats/http/go/Dockerfile

@@ -0,0 +1,8 @@
+FROM fnproject/go:dev as build-stage
+WORKDIR /function
+ADD . /src
+RUN cd /src && go build -o func
+FROM fnproject/go
+WORKDIR /function
+COPY --from=build-stage /src/func /function/
+ENTRYPOINT ["./func"]

examples/formats/http/python/Dockerfile

@@ -1,9 +1,8 @@
-FROM jjanzic/docker-python3-opencv
+FROM python:3.6.2
 
 RUN mkdir /code
 ADD . /code/
 WORKDIR /code
 RUN pip3 install -r requirements.txt
 
-WORKDIR /code/
 ENTRYPOINT ["python3", "func.py"]

examples/formats/json/go/.gitignore

@@ -1,6 +0,0 @@
-vendor/
-/go
-/app
-/__uberscript__
-
-func.yaml

examples/formats/json/go/Dockerfile

@@ -0,0 +1,8 @@
+FROM fnproject/go:dev as build-stage
+WORKDIR /function
+ADD . /src
+RUN cd /src && go build -o func
+FROM fnproject/go
+WORKDIR /function
+COPY --from=build-stage /src/func /function/
+ENTRYPOINT ["./func"]

examples/formats/json/go/func.go

@@ -1,12 +1,11 @@
 package main
 
 import (
-	"bufio"
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"io"
 	"log"
+	"net/http"
 	"os"
 )
 
@@ -14,36 +13,32 @@ type Person struct {
 	Name string `json:"name"`
 }
 
-type JSONInput struct {
+type JSON struct {
-	Body string `json:"body"`
+	Headers    http.Header `json:"headers"`
-}
+	Body       string      `json:"body,omitempty"`
-
+	StatusCode int         `json:"status,omitempty"`
-type JSONOutput struct {
-	StatusCode int    `json:"status"`
-	Body       string `json:"body"`
 }
 
 func main() {
 
-	enc := json.NewEncoder(os.Stdout)
+	stdin := json.NewDecoder(os.Stdin)
-	r := bufio.NewReader(os.Stdin)
+	stdout := json.NewEncoder(os.Stdout)
+	stderr := json.NewEncoder(os.Stderr)
 	for {
-		var buf bytes.Buffer
+		in := &JSON{}
-		in := &JSONInput{}
-		_, err := io.Copy(&buf, r)
-		if err != nil {
-			log.Fatalln(err)
-		}
 
-		err = json.Unmarshal(buf.Bytes(), in)
+		err := stdin.Decode(in)
 		if err != nil {
-			log.Fatalln(err)
+			log.Fatalf("Unable to decode incoming data: %s", err.Error())
+			fmt.Fprintf(os.Stderr, err.Error())
 		}
-
 		person := Person{}
-		if in.Body != "" {
+		stderr.Encode(in.Body)
-			if err := json.Unmarshal([]byte(in.Body), &person); err != nil {
+		stderr.Encode(fmt.Sprintf(in.Body))
-				log.Fatalln(err)
+		if len(in.Body) != 0 {
+			if err := json.NewDecoder(bytes.NewReader([]byte(in.Body))).Decode(&person); err != nil {
+				log.Fatalf("Unable to decode Person object data: %s", err.Error())
+				fmt.Fprintf(os.Stderr, err.Error())
 			}
 		}
 		if person.Name == "" {
@@ -51,11 +46,19 @@ func main() {
 		}
 
 		mapResult := map[string]string{"message": fmt.Sprintf("Hello %s", person.Name)}
-		out := &JSONOutput{StatusCode: 200}
+		b, err := json.Marshal(mapResult)
-		b, _ := json.Marshal(mapResult)
+		if err != nil {
-		out.Body = string(b)
+			log.Fatalf("Unable to marshal JSON response body: %s", err.Error())
-		if err := enc.Encode(out); err != nil {
+			fmt.Fprintf(os.Stderr, err.Error())
-			log.Fatalln(err)
+		}
+		out := &JSON{
+			StatusCode: http.StatusOK,
+			Body:       string(b),
+		}
+		stderr.Encode(out)
+		if err := stdout.Encode(out); err != nil {
+			log.Fatalf("Unable to encode JSON response: %s", err.Error())
+			fmt.Fprintf(os.Stderr, err.Error())
 		}
 	}
 }

examples/formats/json/go/func.yaml

@@ -0,0 +1,7 @@
+name: fnproject/hot-json-go
+version: 0.0.1
+runtime: docker
+type: sync
+memory: 256
+format: json
+path: /hot-json-go

examples/formats/json/go/sample.payload.json

@@ -1,3 +1,3 @@
 {
-    "Name": "Johnny"
+    "name": "Johnny"
 }

examples/formats/json/python/Dockerfile

@@ -0,0 +1,8 @@
+FROM python:3.6.2
+
+RUN mkdir /code
+ADD . /code/
+WORKDIR /code
+RUN pip3 install -r requirements.txt
+
+ENTRYPOINT ["python3", "func.py"]

examples/formats/json/python/func.yaml

@@ -3,5 +3,5 @@ version: 0.0.1
 runtime: docker
 type: sync
 memory: 256
-format: http
+format: json
 path: /hot-json-python

examples/tutorial/hotfunctions/http/go/func.yaml

@@ -1,6 +0,0 @@
-name: hotfunction-http
-version: 0.0.10
-runtime: go
-entrypoint: ./func
-format: http
-path: /hotfn-go