Merge pull request #20 from everFinance/upgrade-client

feat(): fix client api return err

Author: zyjblockchain

client.go

@@ -18,6 +18,8 @@ import (
 	"github.com/everFinance/goar/utils"
 )
 
+// arweave HTTP API: https://docs.arweave.org/developers/server/http-api
+
 type Client struct {
 	client *http.Client
 	url    string
@@ -43,7 +45,7 @@ func NewClient(nodeUrl string, proxyUrl ...string) *Client {
 func (c *Client) GetInfo() (info *types.NetworkInfo, err error) {
 	body, _, err := c.httpGet("info")
 	if err != nil {
-		return
+		return nil, ErrBadGateway
 	}
 
 	info = &types.NetworkInfo{}
@@ -55,46 +57,64 @@ func (c *Client) GetInfo() (info *types.NetworkInfo, err error) {
 func (c *Client) GetTransactionByID(id string) (tx *types.Transaction, err error) {
 	body, statusCode, err := c.httpGet(fmt.Sprintf("tx/%s", id))
 	if err != nil {
-		return
+		return nil, ErrBadGateway
 	}
 
-	if statusCode != 200 {
-		err = errors.New(string(body))
+	switch statusCode {
+	case 200:
+		// json unmarshal
+		tx = &types.Transaction{}
+		err = json.Unmarshal(body, tx)
 		return
+	case 202:
+		return nil, ErrPendingTx
+	case 400:
+		return nil, ErrInvalidId
+	case 404:
+		return nil, ErrNotFound
+	default:
+		return nil, ErrBadGateway
 	}
-
-	// json unmarshal
-	tx = &types.Transaction{}
-	err = json.Unmarshal(body, tx)
-	return
 }
 
 // GetTransactionStatus
 func (c *Client) GetTransactionStatus(id string) (*types.TxStatus, error) {
 	body, code, err := c.httpGet(fmt.Sprintf("tx/%s/status", id))
 	if err != nil {
-		return nil, err
-	}
-	if code != 200 {
-		return nil, errors.New(string(body))
+		return nil, ErrBadGateway
 	}
 
-	// json unmarshal
-	txStatus := &types.TxStatus{}
-	err = json.Unmarshal(body, txStatus)
-	return txStatus, err
+	switch code {
+	case 200:
+		// json unmarshal
+		txStatus := &types.TxStatus{}
+		err = json.Unmarshal(body, txStatus)
+		return txStatus, err
+	case 404:
+		return nil, ErrNotFound
+	default:
+		return nil, ErrBadGateway
+	}
 }
 
-func (c *Client) GetTransactionField(id string, field string) (f string, err error) {
-	url := fmt.Sprintf("tx/%v/%v", id, field)
-
-	body, statusCode, err := c.httpGet(url)
-	if statusCode != 200 {
-		err = fmt.Errorf("not found data")
+func (c *Client) GetTransactionField(id string, field string) (string, error) {
+	body, statusCode, err := c.httpGet(fmt.Sprintf("tx/%v/%v", id, field))
+	if err != nil {
+		return "", ErrBadGateway
 	}
 
-	f = string(body)
-	return
+	switch statusCode {
+	case 200:
+		return string(body), nil
+	case 202:
+		return "", ErrPendingTx
+	case 400:
+		return "", ErrInvalidId
+	case 404:
+		return "", ErrNotFound
+	default:
+		return "", ErrBadGateway
+	}
 }
 
 func (c *Client) GetTransactionTags(id string) ([]types.Tag, error) {
@@ -115,19 +135,25 @@ func (c *Client) GetTransactionTags(id string) ([]types.Tag, error) {
 }
 
 func (c *Client) GetTransactionData(id string, extension ...string) (body []byte, err error) {
-	url := fmt.Sprintf("tx/%v/%v", id, "data")
+	urlPath := fmt.Sprintf("tx/%v/%v", id, "data")
 	if extension != nil {
-		url = url + "." + extension[0]
+		urlPath = urlPath + "." + extension[0]
 	}
-	body, statusCode, err := c.httpGet(url)
+	body, statusCode, err := c.httpGet(urlPath)
 
+	// When data is bigger than 12MiB statusCode == 400 NOTE: Data bigger than that has to be downloaded chunk by chunk.
 	if statusCode == 400 || len(body) == 0 {
 		body, err = c.DownloadChunkData(id)
-	} else if statusCode != 200 {
-		err = fmt.Errorf("not found data")
+		return
+	} else if statusCode == 200 {
+		return body, nil
+	} else if statusCode == 202 {
+		return nil, ErrPendingTx
+	} else if statusCode == 404 {
+		return nil, ErrNotFound
+	} else {
+		return nil, ErrBadGateway
 	}
-
-	return
 }
 
 func (c *Client) GetTransactionPrice(data []byte, target *string) (reward int64, err error) {

error.go

@@ -0,0 +1,10 @@
+package goar
+
+import "errors"
+
+var (
+	ErrNotFound   = errors.New("Not Found")
+	ErrPendingTx  = errors.New("Pending")
+	ErrInvalidId  = errors.New("Invalid ArId")
+	ErrBadGateway = errors.New("Bad Gateway")
+)