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

Addressing more comments + tests

Browse Source
This commit is contained in:
Denis Makogon
2017-10-07 02:11:49 +03:00
parent 9f3bfa1005
commit 181ccf54b4
2 changed files with 121 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,7 +9,7 @@ import (
// This is sent into the function
// All HTTP request headers should be set in env
type JSONIO struct {
type jsonio struct {
Headers http.Header `json:"headers,omitempty"`
Body string `json:"body"`
StatusCode int `json:"status_code,omitempty"`
@@ -25,65 +25,35 @@ func (p *JSONProtocol) IsStreamable() bool {
return true
}
type RequestEncoder struct {
*json.Encoder
func writeString(err error, dst io.Writer, str string) error {
if err != nil {
return err
}
_, err = io.WriteString(dst, str)
return err
}
func (h *JSONProtocol) DumpJSON(w io.Writer, req *http.Request) error {
func (h *JSONProtocol) DumpJSON(req *http.Request) error {
stdin := json.NewEncoder(h.in)
_, err := io.WriteString(h.in, `{`)
if err != nil {
// this shouldn't happen
return err
}
bb := new(bytes.Buffer)
_, err = bb.ReadFrom(req.Body)
if err != nil {
return err
}
reqData := bb.String()
if reqData != "" {
_, err := io.WriteString(h.in, `"body": `)
if err != nil {
// this shouldn't happen
return err
}
err = stdin.Encode(reqData)
if err != nil {
return err
}
_, err = io.WriteString(h.in, `,`)
if err != nil {
// this shouldn't happen
return err
}
defer bb.Reset()
}
_, err = io.WriteString(h.in, `"headers:"`)
if err != nil {
// this shouldn't happen
return err
}
_, err := bb.ReadFrom(req.Body)
err = writeString(err, h.in, "{")
err = writeString(err, h.in, `"body":`)
err = stdin.Encode(bb.String())
err = writeString(err, h.in, ",")
defer bb.Reset()
err = writeString(err, h.in, `"headers":`)
err = stdin.Encode(req.Header)
if err != nil {
// this shouldn't happen
return err
}
_, err = io.WriteString(h.in, `"}`)
if err != nil {
// this shouldn't happen
return err
}
return nil
err = writeString(err, h.in, "}")
return err
}
func (h *JSONProtocol) Dispatch(w io.Writer, req *http.Request) error {
err := h.DumpJSON(w, req)
err := h.DumpJSON(req)
if err != nil {
return err
}
jout := new(JSONIO)
jout := new(jsonio)
dec := json.NewDecoder(h.out)
if err := dec.Decode(jout); err != nil {
return err