refator(BREAKING)!: add support to create new requests Client

client.go

@@ -4,39 +4,69 @@ import (
 	"context"
 	"net/http"
 	"net/http/httputil"
+	"time"
 )
 
-// Do is called by Interceptor to complete HTTP requests.
-type Do func(ctx context.Context, r *Request) (*Response, error)
-
-// InterceptorFunc provides a hook to intercept the execution of an HTTP request
-// invocation. When an interceptor(s) is set, requests delegates all HTTP
-// client invocations to the interceptor, and it is the responsibility of the
-// interceptor to call do to complete the processing of the HTTP request.
-type InterceptorFunc func(ctx context.Context, r *Request, do Do) (*Response, error)
+// ClientOption is the functional option type.
+type ClientOption func(*Client)
 
 type Client struct {
-	*http.Client
+	client      *http.Client
+	interceptor InterceptorFunc
+}
+
+func NewClient(options ...ClientOption) *Client {
+	client := newDefaultClient()
+	for _, setter := range options {
+		setter(client)
+	}
+	return client
+}
+
+func WithTimeout(timeout time.Duration) ClientOption {
+	return func(c *Client) {
+		c.client.Timeout = timeout
+	}
+}
+
+func WithTransport(transport http.RoundTripper) ClientOption {
+	return func(c *Client) {
+		c.client.Transport = transport
+	}
+}
+
+func WithInterceptor(interceptors ...InterceptorFunc) ClientOption {
+	return func(c *Client) {
+		c.interceptor = ChainInterceptors(interceptors...)
+	}
 }
 
-// Do sends the HTTP request and returns after response is received.
-func (c *Client) Do(ctx context.Context, r *Request) (*Response, error) {
+// Do sends an HTTP request and returns an HTTP response, following policy
+// (such as redirects, cookies, auth) as configured on the client.
+func (c *Client) Do(method, url string, opts *Options, body []byte) (*Response, error) {
+	r, err := newRequest(method, url, opts, body)
+	if err != nil {
+		return nil, err
+	}
 	if r.opts.DumpRequestOut != nil {
 		reqDump, err := httputil.DumpRequestOut(r.Request, true)
 		if err != nil {
 			return nil, err
 		}
 		*r.opts.DumpRequestOut = string(reqDump)
 	}
-	if ctx != nil {
-		r = r.WithContext(ctx)
+	ctx := opts.ctx
+	if opts.Timeout > 0 {
+		var cancel context.CancelFunc
+		ctx, cancel = context.WithTimeout(ctx, opts.Timeout)
+		defer cancel()
 	}
 	var interceptors []InterceptorFunc
 	if r.opts.Interceptor != nil {
 		interceptors = append(interceptors, r.opts.Interceptor)
 	}
-	if env.interceptor != nil {
-		interceptors = append(interceptors, env.interceptor)
+	if c.interceptor != nil {
+		interceptors = append(interceptors, c.interceptor)
 	}
 	interceptor := ChainInterceptors(interceptors...)
 	if interceptor != nil {
@@ -48,7 +78,7 @@ func (c *Client) Do(ctx context.Context, r *Request) (*Response, error) {
 func (c *Client) do(ctx context.Context, r *Request) (*Response, error) {
 	// If the returned error is nil, the Response will contain
 	// a non-nil Body which the user is expected to close.
-	resp, err := c.Client.Do(r.Request)
+	resp, err := c.client.Do(r.Request)
 	if err != nil {
 		return nil, err
 	}

client_test.go

@@ -0,0 +1,79 @@
+package requests
+
+import (
+	"context"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+	"time"
+)
+
+func TestClientOption(t *testing.T) {
+	testServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		t.Logf("query strings: %v", r.URL.Query())
+		t.Logf("headers: %v", r.Header)
+		time.Sleep(100 * time.Millisecond)
+		w.WriteHeader(http.StatusOK)
+	}))
+	defer testServer.Close()
+	type args struct {
+		url     string
+		options []ClientOption
+	}
+	tests := []struct {
+		name    string
+		args    args
+		wantErr bool
+	}{
+		{
+			name: "with timeout",
+			args: args{
+				url: testServer.URL,
+				options: []ClientOption{
+					WithTimeout(time.Millisecond),
+				},
+			},
+			wantErr: true,
+		},
+		{
+			name: "with transport",
+			args: args{
+				url: testServer.URL,
+				options: []ClientOption{
+					WithTransport(func() http.RoundTripper {
+						transport := http.DefaultTransport.(*http.Transport).Clone()
+						transport.DisableKeepAlives = true
+						return transport
+					}()),
+				},
+			},
+			wantErr: false,
+		},
+		{
+			name: "with interceptor",
+			args: args{
+				url: testServer.URL,
+				options: []ClientOption{
+					WithInterceptor(func(ctx context.Context, r *Request, do Do) (*Response, error) {
+						t.Logf("method: %s", r.Method)
+						return do(ctx, r)
+					}),
+				},
+			},
+			wantErr: false,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			cli := NewClient(tt.args.options...)
+			got, err := cli.Get(tt.args.url)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("Get() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			if err == nil {
+				t.Logf("response body: %+v\n", got.Text())
+			}
+		})
+	}
+}

default.go

@@ -0,0 +1,35 @@
+package requests
+
+import (
+	"net/http"
+	"sync"
+
+	"github.com/Wenchy/requests/internal/auth/redirector"
+)
+
+var (
+	once          sync.Once
+	defaultClient *Client
+)
+
+func newDefaultClient() *Client {
+	return &Client{
+		client: &http.Client{
+			CheckRedirect: redirector.RedirectPolicyFunc,
+		},
+	}
+}
+
+func GetDefaultClient() *Client {
+	once.Do(func() {
+		defaultClient = newDefaultClient()
+	})
+	return defaultClient
+}
+
+func InitDefaultClient(options ...ClientOption) {
+	client := GetDefaultClient()
+	for _, setter := range options {
+		setter(client)
+	}
+}

interceptor.go

@@ -0,0 +1,38 @@
+package requests
+
+import (
+	"context"
+)
+
+// Do is called by Interceptor to complete HTTP requests.
+type Do func(ctx context.Context, r *Request) (*Response, error)
+
+// InterceptorFunc provides a hook to intercept the execution of an HTTP request
+// invocation. When an interceptor(s) is set, requests delegates all HTTP
+// client invocations to the interceptor, and it is the responsibility of the
+// interceptor to call do to complete the processing of the HTTP request.
+type InterceptorFunc func(ctx context.Context, r *Request, do Do) (*Response, error)
+
+// ChainInterceptors chains multiple interceptors into one.
+func ChainInterceptors(interceptors ...InterceptorFunc) InterceptorFunc {
+	switch len(interceptors) {
+	case 0:
+		return nil
+	case 1:
+		return interceptors[0]
+	default:
+		return func(ctx context.Context, r *Request, do Do) (*Response, error) {
+			return interceptors[0](ctx, r, getChainDo(interceptors, 0, do))
+		}
+	}
+}
+
+// getChainDo generates the chained do recursively.
+func getChainDo(interceptors []InterceptorFunc, curr int, finalDo Do) Do {
+	if curr == len(interceptors)-1 {
+		return finalDo
+	}
+	return func(ctx context.Context, r *Request) (*Response, error) {
+		return interceptors[curr+1](ctx, r, getChainDo(interceptors, curr+1, finalDo))
+	}
+}