增加测试用例

buffer/buffer.go

@@ -77,7 +77,7 @@ type ContentLength interface {
 
 type NopReadCloser struct {
 	r   io.Reader
-	len int
+	len int64
 }
 
 func (rc *NopReadCloser) Read(p []byte) (n int, err error) {
@@ -89,7 +89,7 @@ func (rc *NopReadCloser) Close() error {
 }
 
 func (rc *NopReadCloser) ContentLength() int64 {
-	return int64(rc.len)
+	return rc.len
 }
 
 func NewReadCloser(d []byte) *NopReadCloser {
@@ -98,7 +98,7 @@ func NewReadCloser(d []byte) *NopReadCloser {
 	}
 	return &NopReadCloser{
 		r:   bytes.NewReader(d),
-		len: len(d),
+		len: int64(len(d)),
 	}
 }
 

rest_test.go

@@ -13,6 +13,7 @@ import (
 	"fmt"
 	"github.com/xfali/restclient/restutil"
 	"github.com/xfali/xlog"
+	"io/ioutil"
 	"net/http"
 	"os"
 	"reflect"
@@ -33,6 +34,10 @@ func startHttpServer(shutdown time.Duration) {
 	http.HandleFunc("/test", func(writer http.ResponseWriter, request *http.Request) {
 		v := request.Header.Get(restutil.HeaderAuthorization)
 		fmt.Println(v)
+		if request.Method == http.MethodPost {
+			d, _ := ioutil.ReadAll(request.Body)
+			fmt.Println(string(d))
+		}
 		writer.Header().Set(restutil.HeaderContentType, "application/json")
 		_, err := writer.Write([]byte(`{ "result":["hello", "world"]}`))
 		if err != nil {
@@ -295,6 +300,49 @@ func TestBuilder(t *testing.T) {
 	})
 }
 
+func TestContentLengthFilter(t *testing.T) {
+	t.Run("none", func(t *testing.T) {
+		c := New(SetTimeout(time.Second), AddFilter(
+			NewLog(xlog.GetLogger().WithDepth(5), "test").Filter,
+			ContentLengthFilter),
+		)
+		str := ""
+		_, err := c.Get(&str, "http://localhost:8080/test", nil)
+		if err != nil {
+			t.Fatal(err)
+		}
+		t.Log(str)
+	})
+
+	t.Run("content-length", func(t *testing.T) {
+		c := New(SetTimeout(time.Second), AddFilter(
+			NewLog(xlog.GetLogger().WithDepth(5), "test").Filter,
+			ContentLengthFilter),
+		)
+		str := ""
+		_, err := c.Post(&str, "http://localhost:8080/test", map[string]interface{}{
+			"Content-Length": "5",
+		}, "xxxxx")
+		if err != nil {
+			t.Fatal(err)
+		}
+		t.Log(str)
+	})
+
+	t.Run("auto", func(t *testing.T) {
+		c := New(SetTimeout(time.Second), AddFilter(
+			NewLog(xlog.GetLogger().WithDepth(5), "test").Filter,
+			ContentLengthFilter),
+		)
+		str := ""
+		_, err := c.Post(&str, "http://localhost:8080/test", nil, "xxxxx")
+		if err != nil {
+			t.Fatal(err)
+		}
+		t.Log(str)
+	})
+}
+
 func TestChunkGet(t *testing.T) {
 	t.Run("get_string_chunked", func(t *testing.T) {
 		c := New(SetTimeout(0))

wrap_client.go

@@ -13,7 +13,6 @@ import (
 	"github.com/xfali/restclient/restutil"
 	"github.com/xfali/xlog"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"net/url"
 	"reflect"
@@ -107,7 +106,7 @@ func (dr *DigestReader) Reader(r io.ReadCloser) io.ReadCloser {
 	if err != nil {
 		return nil
 	}
-	return ioutil.NopCloser(bytes.NewReader(dr.buf.Bytes()))
+	return buffer.NewReadCloser(dr.buf.Bytes())
 }
 
 func (b *DigestAuth) Exchange(ex Exchange) Exchange {
@@ -254,19 +253,18 @@ func NewLog(log xlog.Logger, tag string) *Log {
 }
 
 func (log *Log) Filter(request *http.Request, fc FilterChain) (*http.Response, error) {
-	buf := log.pool.Get()
-	defer log.pool.Put(buf)
+	reqBuf := buffer.NewReadWriteCloser(log.pool)
 
 	var reqData []byte
 	if request.Body != nil {
-		_, err := io.Copy(buf, request.Body)
+		_, err := io.Copy(reqBuf, request.Body)
 		if err != nil {
 			return nil, err
 		}
-		reqData = buf.Bytes()
+		reqData = reqBuf.Bytes()
 		// close old request body
 		request.Body.Close()
-		request.Body = buffer.NewReadCloser(reqData)
+		request.Body = reqBuf
 	}
 
 	now := time.Now()