move httpProxyDialer to newHTTPProxyDialerFunc()

Author: cooper-oh

client.go

@@ -255,23 +255,21 @@ func (d *Dialer) DialContext(ctx context.Context, urlStr string, requestHeader h
 			return nil, nil, err
 		}
 		if proxyURL != nil {
-			netDial, err = func(proxyURL *url.URL, forwardDial netDialerFunc) (netDialerFunc, error) {
-				if proxyURL.Scheme == "http" {
-					return (&httpProxyDialer{proxyURL: proxyURL, forwardDial: forwardDial}).DialContext, nil
-				}
+			forwardDial := newNetDialerFunc(proxyURL.Scheme, d.NetDial, d.NetDialContext, d.NetDialTLSContext)
+			if proxyURL.Scheme == "http" || proxyURL.Scheme == "https" {
+				netDial = newHTTPProxyDialerFunc(proxyURL, forwardDial)
+			} else {
 				dialer, err := proxy.FromURL(proxyURL, forwardDial)
 				if err != nil {
-					return nil, err
+					return nil, nil, err
 				}
 				if d, ok := dialer.(proxy.ContextDialer); ok {
-					return d.DialContext, nil
+					netDial = d.DialContext
+				} else {
+					netDial = func(ctx context.Context, net, addr string) (net.Conn, error) {
+						return dialer.Dial(net, addr)
+					}
 				}
-				return func(ctx context.Context, net, addr string) (net.Conn, error) {
-					return dialer.Dial(net, addr)
-				}, nil
-			}(proxyURL, netDial)
-			if err != nil {
-				return nil, nil, err
 			}
 		}
 	}

proxy.go

@@ -46,62 +46,59 @@ func (fn netDialerFunc) DialContext(ctx context.Context, network, addr string) (
 	return fn(ctx, network, addr)
 }
 
-type httpProxyDialer struct {
-	proxyURL    *url.URL
-	forwardDial netDialerFunc
-}
-
-func (hpd *httpProxyDialer) DialContext(ctx context.Context, network string, addr string) (net.Conn, error) {
-	hostPort, _ := hostPortNoPort(hpd.proxyURL)
-	conn, err := hpd.forwardDial(ctx, network, hostPort)
-	if err != nil {
-		return nil, err
-	}
+func newHTTPProxyDialerFunc(proxyURL *url.URL, forwardDial netDialerFunc) netDialerFunc {
+	return func(ctx context.Context, network, addr string) (net.Conn, error) {
+		hostPort, _ := hostPortNoPort(proxyURL)
+		conn, err := forwardDial(ctx, network, hostPort)
+		if err != nil {
+			return nil, err
+		}
 
-	connectHeader := make(http.Header)
-	if user := hpd.proxyURL.User; user != nil {
-		proxyUser := user.Username()
-		if proxyPassword, passwordSet := user.Password(); passwordSet {
-			credential := base64.StdEncoding.EncodeToString([]byte(proxyUser + ":" + proxyPassword))
-			connectHeader.Set("Proxy-Authorization", "Basic "+credential)
+		connectHeader := make(http.Header)
+		if user := proxyURL.User; user != nil {
+			proxyUser := user.Username()
+			if proxyPassword, passwordSet := user.Password(); passwordSet {
+				credential := base64.StdEncoding.EncodeToString([]byte(proxyUser + ":" + proxyPassword))
+				connectHeader.Set("Proxy-Authorization", "Basic "+credential)
+			}
 		}
-	}
 
-	connectReq := &http.Request{
-		Method: http.MethodConnect,
-		URL:    &url.URL{Opaque: addr},
-		Host:   addr,
-		Header: connectHeader,
-	}
+		connectReq := &http.Request{
+			Method: http.MethodConnect,
+			URL:    &url.URL{Opaque: addr},
+			Host:   addr,
+			Header: connectHeader,
+		}
 
-	if err := connectReq.Write(conn); err != nil {
-		conn.Close()
-		return nil, err
-	}
+		if err := connectReq.Write(conn); err != nil {
+			conn.Close()
+			return nil, err
+		}
 
-	// Read response. It's OK to use and discard buffered reader here because
-	// the remote server does not speak until spoken to.
-	br := bufio.NewReader(conn)
-	resp, err := http.ReadResponse(br, connectReq)
-	if err != nil {
-		conn.Close()
-		return nil, err
-	}
+		// Read response. It's OK to use and discard buffered reader here because
+		// the remote server does not speak until spoken to.
+		br := bufio.NewReader(conn)
+		resp, err := http.ReadResponse(br, connectReq)
+		if err != nil {
+			conn.Close()
+			return nil, err
+		}
 
-	// Close the response body to silence false positives from linters. Reset
-	// the buffered reader first to ensure that Close() does not read from
-	// conn.
-	// Note: Applications must call resp.Body.Close() on a response returned
-	// http.ReadResponse to inspect trailers or read another response from the
-	// buffered reader. The call to resp.Body.Close() does not release
-	// resources.
-	br.Reset(bytes.NewReader(nil))
-	_ = resp.Body.Close()
+		// Close the response body to silence false positives from linters. Reset
+		// the buffered reader first to ensure that Close() does not read from
+		// conn.
+		// Note: Applications must call resp.Body.Close() on a response returned
+		// http.ReadResponse to inspect trailers or read another response from the
+		// buffered reader. The call to resp.Body.Close() does not release
+		// resources.
+		br.Reset(bytes.NewReader(nil))
+		_ = resp.Body.Close()
 
-	if resp.StatusCode != http.StatusOK {
-		_ = conn.Close()
-		f := strings.SplitN(resp.Status, " ", 2)
-		return nil, errors.New(f[1])
+		if resp.StatusCode != http.StatusOK {
+			_ = conn.Close()
+			f := strings.SplitN(resp.Status, " ", 2)
+			return nil, errors.New(f[1])
+		}
+		return conn, nil
 	}
-	return conn, nil
 }