feat: add response

client.go

@@ -17,8 +17,12 @@
 package easy_http
 
 import (
+	"context"
+	"github.com/cloudwego/hertz/pkg/protocol"
 	"net/http"
 	"net/url"
+	"sync"
+	"time"
 
 	"github.com/cloudwego/hertz/pkg/app/client"
 )
@@ -29,17 +33,19 @@ type Client struct {
 	Header     http.Header
 	Cookies    []*http.Cookie
 
-	client *client.Client
-}
+	beforeRequest       []RequestMiddleware
+	udBeforeRequest     []RequestMiddleware
+	afterResponse       []ResponseMiddleware
+	afterResponseLock   *sync.RWMutex
+	udBeforeRequestLock *sync.RWMutex
 
-func New() *Client {
-	c, _ := client.NewClient()
-	return &Client{client: c}
+	client *client.Client
 }
 
-func NewWithHertzClient(c *client.Client) *Client {
-	return createClient(c)
-}
+type (
+	RequestMiddleware  func(*Client, *Request) error
+	ResponseMiddleware func(*Client, *Response) error
+)
 
 func createClient(c *client.Client) *Client {
 	return &Client{client: c}
@@ -67,6 +73,7 @@ func (c *Client) SetQueryParamsFromValues(params url.Values) *Client {
 }
 
 func (c *Client) SetQueryString(query string) *Client {
+	// todo: parse query string
 	return c
 }
 
@@ -106,6 +113,15 @@ func (c *Client) SetHeaders(headers map[string]string) *Client {
 	return c
 }
 
+func (c *Client) SetHeaderMultiValues(headers map[string][]string) *Client {
+	for k, header := range headers {
+		for _, v := range header {
+			c.Header.Set(k, v)
+		}
+	}
+	return c
+}
+
 func (c *Client) AddHeader(header, value string) *Client {
 	c.Header.Add(header, value)
 	return c
@@ -118,6 +134,46 @@ func (c *Client) AddHeaders(headers map[string]string) *Client {
 	return c
 }
 
+func (c *Client) AddHeaderMultiValues(headers map[string][]string) *Client {
+	for k, header := range headers {
+		for _, v := range header {
+			c.Header.Add(k, v)
+		}
+	}
+	return c
+}
+
+func (c *Client) SetContentType(contentType string) *Client {
+	c.Header.Set("Content-Type", contentType)
+	return c
+}
+
+func (c *Client) SetJSONContentType() *Client {
+	c.Header.Set("Content-Type", "application/json")
+	return c
+}
+
+func (c *Client) SetXMLContentType() *Client {
+	c.Header.Set("Content-Type", "application/xml")
+	return c
+}
+
+func (c *Client) SetHTMLContentType() *Client {
+	c.Header.Set("Content-Type", "text/html")
+	return c
+}
+
+func (c *Client) SetFormContentType() *Client {
+	c.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+	return c
+
+}
+
+func (c *Client) SetXFormData() *Client {
+	c.Header.Set("Content-Type", "multipart/form-data")
+	return c
+}
+
 func (c *Client) SetCookie(hc *http.Cookie) *Client {
 	c.Cookies = append(c.Cookies, hc)
 	return c
@@ -143,3 +199,60 @@ func (c *Client) R() *Request {
 func (c *Client) NewRequest() *Request {
 	return c.R()
 }
+
+func (c *Client) execute(req *Request) (*Response, error) {
+	// Lock the user-defined pre-request hooks.
+	c.udBeforeRequestLock.RLock()
+	defer c.udBeforeRequestLock.RUnlock()
+
+	// Lock the post-request hooks.
+	c.afterResponseLock.RLock()
+	defer c.afterResponseLock.RUnlock()
+
+	// Apply Request middleware
+	var err error
+
+	// user defined on before request methods
+	// to modify the *resty.Request object
+	for _, f := range c.udBeforeRequest {
+		if err = f(c, req); err != nil {
+			return nil, err
+		}
+	}
+
+	for _, f := range c.beforeRequest {
+		if err = f(c, req); err != nil {
+			return nil, err
+		}
+	}
+
+	if hostHeader := req.Header.Get("Host"); hostHeader != "" {
+		req.RawRequest.SetHost(hostHeader)
+	}
+
+	req.Time = time.Now()
+
+	resp := &protocol.Response{}
+	err = c.client.Do(context.Background(), req.RawRequest, resp)
+
+	response := &Response{
+		Request:     req,
+		RawResponse: resp,
+	}
+
+	if err != nil {
+		response.receiveAt = time.Now()
+		return response, err
+	}
+
+	response.receiveAt = time.Now()
+
+	// Apply Response middleware
+	for _, f := range c.afterResponse {
+		if err = f(c, response); err != nil {
+			break
+		}
+	}
+
+	return response, err
+}

easy_http.go

@@ -0,0 +1,36 @@
+/*
+ * Copyright 2024 CloudWeGo Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package easy_http
+
+import "github.com/cloudwego/hertz/pkg/app/client"
+
+func New() (*Client, error) {
+	c, err := client.NewClient()
+	return &Client{client: c}, err
+}
+
+func MustNew() *Client {
+	c, err := client.NewClient()
+	if err != nil {
+		panic(err)
+	}
+	return &Client{client: c}
+}
+
+func NewWithHertzClient(c *client.Client) *Client {
+	return createClient(c)
+}

middleware.go

@@ -0,0 +1,17 @@
+/*
+ * Copyright 2024 CloudWeGo Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package easy_http

request.go

@@ -20,6 +20,7 @@ import (
 	"context"
 	"net/http"
 	"net/url"
+	"time"
 
 	"github.com/cloudwego/hertz/pkg/common/config"
 	"github.com/cloudwego/hertz/pkg/protocol"
@@ -37,6 +38,7 @@ type Request struct {
 	FileParams     map[string]string
 	BodyParams     interface{}
 	RawRequest     *protocol.Request
+	Time           time.Time
 	Ctx            context.Context
 	RequestOptions []config.RequestOption
 	Result         interface{}

response.go

@@ -0,0 +1,88 @@
+/*
+ * Copyright 2024 CloudWeGo Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package easy_http
+
+import (
+	"github.com/cloudwego/hertz/pkg/protocol"
+	"strings"
+	"time"
+)
+
+type Response struct {
+	Request     *Request // 上面的 Request 结构体
+	RawResponse *protocol.Response
+
+	receiveAt time.Time
+
+	bodyByte []byte
+	size     int64
+}
+
+func (r *Response) Body() []byte {
+	if r.RawResponse == nil {
+		return []byte{}
+	}
+	return r.bodyByte
+}
+
+func (r *Response) BodyString() string {
+	if r.RawResponse == nil {
+		return ""
+	}
+	return strings.TrimSpace(string(r.bodyByte))
+}
+
+func (r *Response) StatusCode() int {
+	if r.RawResponse == nil {
+		return 0
+	}
+	return r.RawResponse.StatusCode()
+}
+
+func (r *Response) Result() interface{} {
+	return r.Request.Result
+}
+
+func (r *Response) Error() interface{} {
+	return r.Request.Error
+}
+
+// todo
+//func (r *Response) Header() http.Header {
+//	if r.RawResponse == nil {
+//		return http.Header{}
+//	}
+//	return r.RawResponse.Header.GetHeaders()
+//}
+//
+//func (r *Response) Cookies() []*http.Cookie {
+//	if r.RawResponse == nil {
+//		return make([]*http.Cookie, 0)
+//	}
+//	return r.RawResponse.Header.GetCookies()
+//}
+//func (r *Response) ToRawHTTPResponse() string {
+//	return r.RawResponse.String()
+//}
+
+func (r *Response) IsSuccess() bool {
+	return r.StatusCode() > 199 && r.StatusCode() < 300
+}
+
+func (r *Response) IsError() bool {
+	return r.StatusCode() > 399
+}