From 81cf507e4eada69cdc74eb4f746e70c7a5ca7b79 Mon Sep 17 00:00:00 2001 From: sago35 Date: Sun, 25 Dec 2022 11:41:36 +0900 Subject: [PATCH] net/http: add support for RoundTripper --- net/http/tinygo.go | 51 ++++++++++++++++++++++++++++++---------------- 1 file changed, 33 insertions(+), 18 deletions(-) diff --git a/net/http/tinygo.go b/net/http/tinygo.go index 6ac3449..c2437cc 100644 --- a/net/http/tinygo.go +++ b/net/http/tinygo.go @@ -25,17 +25,43 @@ func (c *Client) Do(req *Request) (*Response, error) { req.AddCookie(cookie) } } + + transport := c.Transport + if transport == nil { + transport = DefaultTransport + } + res, err := transport.RoundTrip(req) + + if c.Jar != nil { + if rc := res.Cookies(); len(rc) > 0 { + c.Jar.SetCookies(req.URL, rc) + } + } + + return res, err +} + +type Transport struct { +} + +var DefaultTransport RoundTripper + +func init() { + DefaultTransport = &Transport{} +} + +func (t *Transport) RoundTrip(req *Request) (*Response, error) { switch req.URL.Scheme { case "http": - return c.doHTTP(req) + return t.doHTTP(req) case "https": - return c.doHTTPS(req) + return t.doHTTPS(req) default: return nil, fmt.Errorf("invalid schemer : %s", req.URL.Scheme) } } -func (c *Client) doHTTP(req *Request) (*Response, error) { +func (t *Transport) doHTTP(req *Request) (*Response, error) { // make TCP connection ip := net.ParseIP(req.URL.Hostname()) port := 80 @@ -106,10 +132,10 @@ func (c *Client) doHTTP(req *Request) (*Response, error) { } - return c.doResp(conn, req) + return t.doResp(conn, req) } -func (c *Client) doHTTPS(req *Request) (*Response, error) { +func (t *Transport) doHTTPS(req *Request) (*Response, error) { conn, err := tls.Dial("tcp", req.URL.Host, nil) retry := 0 for ; err != nil; conn, err = tls.Dial("tcp", req.URL.Host, nil) { @@ -167,10 +193,10 @@ func (c *Client) doHTTPS(req *Request) (*Response, error) { } - return c.doResp(conn, req) + return t.doResp(conn, req) } -func (c *Client) doResp(conn net.Conn, req *Request) (*Response, error) { +func (t *Transport) doResp(conn net.Conn, req *Request) (*Response, error) { resp := &Response{ Header: map[string][]string{}, } @@ -256,11 +282,6 @@ func (c *Client) doResp(conn net.Conn, req *Request) (*Response, error) { remain -= int64(ofs) if remain <= 0 { resp.Body = io.NopCloser(bytes.NewReader(buf[:ofs])) - if c.Jar != nil { - if rc := resp.Cookies(); len(rc) > 0 { - c.Jar.SetCookies(req.URL, rc) - } - } return resp, conn.Close() } @@ -298,11 +319,5 @@ func (c *Client) doResp(conn net.Conn, req *Request) (*Response, error) { } } - if c.Jar != nil { - if rc := resp.Cookies(); len(rc) > 0 { - c.Jar.SetCookies(req.URL, rc) - } - } - return resp, conn.Close() }