alihan/fn-serverless
1
0
Fork 0
mirror of https://github.com/fnproject/fn.git synced 2022-10-28 21:29:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

We still can write JSON request object in parts

Browse Source 
except just copying content from request body to STDIN
  we need to write encoded data,
  so we're using STDIN JSON stream encoder.
This commit is contained in:
Denis Makogon
2017-10-03 16:00:39 +03:00
parent 3ae55af392
commit 7dd9b5a4cd
1 changed files with 11 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
api/agent/protocol/json.go
View File

@@ -30,21 +30,8 @@ type RequestEncoder struct {
*json.Encoder *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 rq.Body.Close()
defer bb.Reset()
return re.Encode(JSONIO{
Headers: rq.Header,
Body: bb.String(),
})
}
func (h *JSONProtocol) DumpJSON(w io.Writer, req *http.Request) error { func (h *JSONProtocol) DumpJSON(w io.Writer, req *http.Request) error {
stdin := json.NewEncoder(h.in)
_, err := io.WriteString(h.in, `{`) _, err := io.WriteString(h.in, `{`)
if err != nil { if err != nil {
// this shouldn't happen // this shouldn't happen
@@ -56,9 +43,14 @@ func (h *JSONProtocol) DumpJSON(w io.Writer, req *http.Request) error {
// this shouldn't happen // this shouldn't happen
return err return err
} }
_, err = io.Copy(h.in, req.Body) bb := new(bytes.Buffer)
_, err = bb.ReadFrom(req.Body)
if err != nil {
return err
}
err = stdin.Encode(bb.String())
if err != nil { if err != nil {
// this shouldn't happen
return err return err
} }
_, err = io.WriteString(h.in, `",`) _, err = io.WriteString(h.in, `",`)
@@ -66,6 +58,7 @@ func (h *JSONProtocol) DumpJSON(w io.Writer, req *http.Request) error {
// this shouldn't happen // this shouldn't happen
return err return err
} }
defer bb.Reset()
defer req.Body.Close() defer req.Body.Close()
} }
_, err = io.WriteString(h.in, `"headers:"`) _, err = io.WriteString(h.in, `"headers:"`)
@@ -73,7 +66,7 @@ func (h *JSONProtocol) DumpJSON(w io.Writer, req *http.Request) error {
// this shouldn't happen // this shouldn't happen
return err return err
} }
err = json.NewEncoder(h.in).Encode(req.Header) err = stdin.Encode(req.Header)
if err != nil { if err != nil {
// this shouldn't happen // this shouldn't happen
return err return err
@@ -87,9 +80,7 @@ func (h *JSONProtocol) DumpJSON(w io.Writer, req *http.Request) error {
} }
func (h *JSONProtocol) Dispatch(w io.Writer, req *http.Request) error { func (h *JSONProtocol) Dispatch(w io.Writer, req *http.Request) error {
ce := RequestEncoder{json.NewEncoder(h.in)} err := h.DumpJSON(w, req)
err := ce.EncodeRequest(req)
//err := h.DumpJSON(w, req)
if err != nil { if err != nil {
return respondWithError( return respondWithError(
w, fmt.Errorf("unable to write JSON into STDIN: %s", err.Error())) w, fmt.Errorf("unable to write JSON into STDIN: %s", err.Error()))