foomo/contentserver
1
0
Fork 0
mirror of https://github.com/foomo/contentserver.git synced 2025-10-16 12:25:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

response wrapper to fix json unmarshal issues (#21)

Browse Source 
* chore: change wrapping

* fix: fix mapping bugs

Co-authored-by: Stefan Martinov <stefan.martinov@gmail.com>
This commit is contained in:
Frederik Löffert 2020-04-01 12:25:55 +02:00 committed by GitHub
parent f75f3a09ae
commit 0ab7935a05
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 52 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
client/client.go
View File

@ -33,49 +33,69 @@ func NewHTTPClient(server string) (c *Client, err error) {
}
// Update tell the server to update itself
func (c *Client) Update() (response *responses.Update, err error) {
response = &responses.Update{}
err = c.t.call(server.HandlerUpdate, &requests.Update{}, response)
return
func (c *Client) Update() (*responses.Update, error) {
type serverResponse struct {
Reply *responses.Update
}
resp := serverResponse{}
if err := c.t.call(server.HandlerUpdate, &requests.Update{}, &resp); err != nil {
return nil, err
}
return resp.Reply, nil
}
// GetContent request site content
func (c *Client) GetContent(request *requests.Content) (response *content.SiteContent, err error) {
response = &content.SiteContent{}
err = c.t.call(server.HandlerGetContent, request, response)
return
func (c *Client) GetContent(request *requests.Content) (*content.SiteContent, error) {
type serverResponse struct {
Reply *content.SiteContent
}
resp := serverResponse{}
if err := c.t.call(server.HandlerGetContent, request, &resp); err != nil {
return nil, err
}
return resp.Reply, nil
}
// GetURIs resolve uris for ids in a dimension
func (c *Client) GetURIs(dimension string, IDs []string) (uriMap map[string]string, err error) {
uriMap = map[string]string{}
err = c.t.call(
server.HandlerGetURIs,
&requests.URIs{
Dimension: dimension,
IDs: IDs,
},
&uriMap,
)
return
func (c *Client) GetURIs(dimension string, IDs []string) (map[string]string, error) {
type serverResponse struct {
Reply map[string]string
}
resp := serverResponse{}
if err := c.t.call(server.HandlerGetURIs, &requests.URIs{Dimension: dimension, IDs: IDs}, &resp); err != nil {
return nil, err
}
return resp.Reply, nil
}
// GetNodes request nodes
func (c *Client) GetNodes(env *requests.Env, nodes map[string]*requests.Node) (nodesResponse map[string]*content.Node, err error) {
func (c *Client) GetNodes(env *requests.Env, nodes map[string]*requests.Node) (map[string]*content.Node, error) {
r := &requests.Nodes{
Env: env,
Nodes: nodes,
}
nodesResponse = map[string]*content.Node{}
err = c.t.call(server.HandlerGetNodes, r, &nodesResponse)
return
type serverResponse struct {
Reply map[string]*content.Node
}
resp := serverResponse{}
if err := c.t.call(server.HandlerGetNodes, r, &resp); err != nil {
return nil, err
}
return resp.Reply, nil
}
// GetRepo get the whole repo
func (c *Client) GetRepo() (response map[string]*content.RepoNode, err error) {
response = map[string]*content.RepoNode{}
err = c.t.call(server.HandlerGetRepo, &requests.Repo{}, &response)
return
func (c *Client) GetRepo() (map[string]*content.RepoNode, error) {
type serverResponse struct {
Reply map[string]*content.RepoNode
}
resp := serverResponse{}
if err := c.t.call(server.HandlerGetRepo, &requests.Repo{}, &resp); err != nil {
return nil, err
}
return resp.Reply, nil
}
func (c *Client) ShutDown() {

9
client/httptransport.go
View File

@ -42,6 +42,8 @@ func (ht *httpTransport) call(handler server.Handler, request interface{}, respo
if errDo != nil {
return errDo
}
defer httpResponse.Body.Close()
if httpResponse.StatusCode != http.StatusOK {
return errors.New("non 200 reply")
}
@ -49,13 +51,8 @@ func (ht *httpTransport) call(handler server.Handler, request interface{}, respo
return errors.New("empty response body")
}
responseBytes, errRead := ioutil.ReadAll(httpResponse.Body)
httpResponse.Body.Close()
if errRead != nil {
return errRead
}
errUnmarshal := json.Unmarshal(responseBytes, &serverResponse{Reply: response})
if errUnmarshal != nil {
return errUnmarshal
}
return errUnmarshal
return json.Unmarshal(responseBytes, response)
}

8
client/sockettransport.go
View File

@ -15,10 +15,6 @@ import (
var json = jsoniter.ConfigCompatibleWithStandardLibrary
type serverResponse struct {
Reply interface{}
}
type connReturn struct {
conn net.Conn
err error
@ -113,8 +109,8 @@ func (c *socketTransport) call(handler server.Handler, request interface{}, resp
}
// unmarshal response
responseJSONErr := json.Unmarshal(responseBytes, &serverResponse{Reply: response})
if responseJSONErr != nil {
errResponse := json.Unmarshal(responseBytes, response)
if errResponse != nil {
// is it an error ?
var (
remoteErr = responses.Error{}