add logo

README.md

@@ -1,29 +1,18 @@
-# Hasaki
+<div align="center">
+    <h1>Hasaki</h1>
+    <h5>HTTP Request Library for Go</h5>
+    <img src="assets/logo.png" alt="logo" width="300px">
+</div>
 
-HTTP Request Library for Go
+___
 
-[![Build Status][1]][2] [![codecov][3]][4]
-
-[1]: https://github.com/lxzan/hasaki/workflows/Go%20Test/badge.svg?branch=master
-[2]: https://github.com/lxzan/hasaki/actions?query=branch%3Amaster
-[3]: https://codecov.io/gh/lxzan/hasaki/graph/badge.svg?token=0VY55RLS3G
-[4]: https://codecov.io/gh/lxzan/hasaki
-
-- [Hasaki](#hasaki)
-    - [Features](#features)
-    - [Install](#install)
-    - [Usage](#usage)
-      - [Get](#get)
-      - [Post](#post)
-      - [Stream](#stream)
-      - [Error Stack](#error-stack)
-      - [Middleware](#middleware)
+[![go-test](https://github.com/lxzan/hasaki/workflows/Go%20Test/badge.svg?branch=master)](https://github.com/lxzan/hasaki/actions?query=branch%3Amaster) [![codecov](https://codecov.io/gh/lxzan/hasaki/graph/badge.svg?token=0VY55RLS3G)](https://codecov.io/gh/lxzan/hasaki)
 
 ### Features
 
 -   [x] Buffer Pool
 -   [x] Trace the Error Stack
--   [x] Build-In JSON / XML / WWWForm / Protobuf/YAML Codec 
+-   [x] Build-In JSON / XML / WWWForm / Protobuf / YAML Codec 
 -   [x] Request Before and After Middleware
 -   [x] Export cURL Command in Debug Mode
 

client_test.go

@@ -404,7 +404,7 @@ func TestRequest_ReadBody(t *testing.T) {
 		var cli, _ = NewClient(WithReuseBody())
 		var resp = cli.Get("http://%s/greet", addr).Send(nil)
 		assert.NoError(t, resp.Err())
-		_, ok := resp.Body.(BytesReader)
+		_, ok := resp.Body.(BytesReadCloser)
 		assert.True(t, ok)
 		_, err := resp.ReadBody()
 		assert.NoError(t, err)

config.go

@@ -80,8 +80,8 @@ func WithHTTPClient(client *http.Client) Option {
 	}
 }
 
-// WithReuseBody 开启body复用; Response.Body可以被断言为BytesReader, 重复调用Bytes()方法.
-// Enable body reuse; Response.Body can be asserted as a BytesReader, calling the Bytes() method repeatedly.
+// WithReuseBody 开启body复用; Response.Body可以被断言为BytesReadCloser, 重复调用Bytes()方法.
+// Enable body reuse; Response.Body can be asserted as a BytesReadCloser, calling the Bytes() method repeatedly.
 func WithReuseBody() Option {
 	return func(c *config) {
 		c.ReuseBodyEnabled = true
@@ -111,7 +111,7 @@ func withInitialize() Option {
 	}
 }
 
-type BytesReader interface {
-	io.Reader
+type BytesReadCloser interface {
+	io.ReadCloser
 	Bytes() []byte
 }

contrib/pb/codec.go

@@ -40,7 +40,7 @@ func Decode(r io.Reader, v any) error {
 	if !ok {
 		return errors.WithStack(errDataType)
 	}
-	if br, ok := r.(hasaki.BytesReader); ok {
+	if br, ok := r.(hasaki.BytesReadCloser); ok {
 		return errors.WithStack(proto.Unmarshal(br.Bytes(), message))
 	}
 	var w = bytebufferpool.Get()

request.go

@@ -145,22 +145,22 @@ func (c *Request) SetQuery(query any) *Request {
 // Send 发送请求
 // Send http request
 func (c *Request) Send(body any) *Response {
-	response := &Response{ctx: c.ctx}
+	resp := &Response{ctx: c.ctx}
 	if c.err != nil {
-		response.err = c.err
-		return response
+		resp.err = c.err
+		return resp
 	}
 
 	reader, err := c.encoder.Encode(body)
 	if err != nil {
-		response.err = err
-		return response
+		resp.err = err
+		return resp
 	}
 
 	req, err := http.NewRequestWithContext(c.ctx, c.method, c.url, reader)
 	if err != nil {
-		response.err = errors.WithStack(err)
-		return response
+		resp.err = errors.WithStack(err)
+		return resp
 	}
 
 	if c.method == http.MethodGet && body == nil {
@@ -169,8 +169,8 @@ func (c *Request) Send(body any) *Response {
 	req.Header = c.headers
 
 	// 执行请求前中间件
-	if response.ctx, response.err = c.before(c.ctx, req); response.err != nil {
-		return response
+	if resp.ctx, resp.err = c.before(c.ctx, req); resp.err != nil {
+		return resp
 	}
 
 	// 打印CURL命令
@@ -179,21 +179,21 @@ func (c *Request) Send(body any) *Response {
 	}
 
 	// 发起请求
-	if response.Response, err = c.client.Do(req); err != nil {
-		response.err = errors.WithStack(err)
-		return response
+	if resp.Response, err = c.client.Do(req); err != nil {
+		resp.err = errors.WithStack(err)
+		return resp
 	}
 
 	// 预先读取body, 可复用
 	if c.reuseBodyEnabled {
-		if response.err = c.readBody(response); response.err != nil {
-			return response
+		if resp.err = c.readBody(resp); resp.err != nil {
+			return resp
 		}
 	}
 
 	// 执行请求后中间件
-	response.ctx, response.err = c.after(response.ctx, response.Response)
-	return response
+	resp.ctx, resp.err = c.after(resp.ctx, resp.Response)
+	return resp
 }
 
 func (c *Request) readBody(resp *Response) error {

response.go

@@ -29,7 +29,7 @@ func (c *Response) ReadBody() ([]byte, error) {
 	if c.Response == nil || c.Body == nil {
 		return nil, errors.WithStack(errEmptyResponse)
 	}
-	if v, ok := c.Body.(BytesReader); ok {
+	if v, ok := c.Body.(BytesReadCloser); ok {
 		return v.Bytes(), nil
 	}
 	b, err := io.ReadAll(c.Body)