[dev] client call is now okay

nanmu42 · nanmu42 · commit 55f4a9385dcb · 2018-07-31T23:00:39.000+08:00
diff --git a/client.go b/client.go
@@ -13,6 +13,7 @@ import (
 	"fmt"
 	"io"
 	"net/http"
+	"net/http/httputil"
 	"net/url"
 )
 
@@ -49,14 +50,41 @@ func New(network Network, APIKey string) *Client {
 
 // call does almost all the dirty work.
 func (c *Client) call(module, action string, param map[string]interface{}, outcome interface{}) (err error) {
-	// todo: fire hooks
-	// todo: verbose mode
+	// fire hooks if in need
+	if c.BeforeRequest != nil {
+		err = c.BeforeRequest(module, action, param)
+		if err != nil {
+			err = wrapErr(err, "beforeRequest")
+			return
+		}
+	}
+	if c.AfterRequest != nil {
+		defer c.AfterRequest(module, action, param, outcome, err)
+	}
 
-	req, err := http.NewRequest(http.MethodGet, c.craftURL(param), http.NoBody)
+	req, err := http.NewRequest(http.MethodGet, c.craftURL(module, action, param), http.NoBody)
 	if err != nil {
 		err = wrapErr(err, "http.NewRequest")
 		return
 	}
+	req.Header.Set("User-Agent", "etherscan-api(Go)")
+
+	if c.Verbose {
+		var reqDump []byte
+		reqDump, err = httputil.DumpRequestOut(req, false)
+		if err != nil {
+			err = wrapErr(err, "verbose mode req dump failed")
+			return
+		}
+
+		fmt.Printf("\n%s\n", reqDump)
+
+		defer func() {
+			if err != nil {
+				fmt.Printf("[Error] %v\n", err)
+			}
+		}()
+	}
 
 	res, err := c.coon.Do(req)
 	if err != nil {
@@ -65,6 +93,17 @@ func (c *Client) call(module, action string, param map[string]interface{}, outco
 	}
 	defer res.Body.Close()
 
+	if c.Verbose {
+		var resDump []byte
+		resDump, err = httputil.DumpResponse(res, true)
+		if err != nil {
+			err = wrapErr(err, "verbose mode res dump failed")
+			return
+		}
+
+		fmt.Printf("%s\n", resDump)
+	}
+
 	var content bytes.Buffer
 	if _, err = io.Copy(&content, res.Body); err != nil {
 		err = wrapErr(err, "reading response")
@@ -76,18 +115,31 @@ func (c *Client) call(module, action string, param map[string]interface{}, outco
 		return
 	}
 
-	err = json.Unmarshal(content.Bytes(), outcome)
+	var envelope Envelope
+	err = json.Unmarshal(content.Bytes(), &envelope)
+	if err != nil {
+		err = wrapErr(err, "json unmarshal envelope")
+		return
+	}
+	if envelope.Status != 1 {
+		err = fmt.Errorf("etherscan server: %s", envelope.Message)
+		return
+	}
+
+	err = json.Unmarshal(envelope.Result, outcome)
 	if err != nil {
-		err = wrapErr(err, "json unmarshal")
+		err = wrapErr(err, "json unmarshal outcome")
 		return
 	}
 
 	return
 }
 
 // craftURL returns desired URL via param provided
-func (c *Client) craftURL(param map[string]interface{}) (URL string) {
+func (c *Client) craftURL(module, action string, param map[string]interface{}) (URL string) {
 	q := url.Values{
+		"module": []string{module},
+		"action": []string{action},
 		"apikey": []string{c.key},
 	}
 
diff --git a/client_test.go b/client_test.go
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2018 LI Zhennan
+ *
+ * Use of this work is governed by a MIT License.
+ * You may find a license copy in project root.
+ */
+
+package etherscan
+
+import (
+	"testing"
+)
+
+func TestClient_craftURL(t *testing.T) {
+	c := New(Ropsten, "abc123")
+
+	const expected = `https://api-ropsten.etherscan.io/api?action=craftURL&apikey=abc123&four=d&four=e&four=f&module=testing&one=1&three=1&three=2&three=3&two=2`
+	output := c.craftURL("testing", "craftURL", M{
+		"one":   1,
+		"two":   "2",
+		"three": []int{1, 2, 3},
+		"four":  []string{"d", "e", "f"},
+	})
+
+	if output != expected {
+		t.Fatalf("output != expected, got %s, want %s", output, expected)
+	}
+}
diff --git a/response.go b/response.go
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2018 LI Zhennan
+ *
+ * Use of this work is governed by a MIT License.
+ * You may find a license copy in project root.
+ */
+
+package etherscan
+
+import "encoding/json"
+
+// Envelope is the carrier of nearly every response
+type Envelope struct {
+	// 1 for good, 0 for error
+	Status int `json:"status,string"`
+	// OK for good, other words when Status equals 0
+	Message string `json:"message"`
+	// where response lies
+	Result json.RawMessage `json:"result"`
+}
