[+] fix: concurrent HTTP requests (#107)

* [+] fix: concurrent HTTP requests * chore: Updated coverage badge. --------- Co-authored-by: GitHub Action <[email protected]>
Noooste · Jul 2, 2024 · bd43e91 · bd43e91
1 parent 8d108b4
commit bd43e91
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # AzureTLS Client 
 [![GoDoc](https://godoc.org/github.com/Noooste/azuretls-client?status.svg)](https://godoc.org/github.com/Noooste/azuretls-client)
-![Coverage](https://img.shields.io/badge/Coverage-77.8%25-brightgreen)
+![Coverage](https://img.shields.io/badge/Coverage-77.6%25-brightgreen)
 [![build](https://github.com/Noooste/azuretls-client/actions/workflows/push.yml/badge.svg)](https://github.com/Noooste/azuretls-client/actions/workflows/push.yml)
 [![Go Report Card](https://goreportcard.com/badge/Noooste/azuretls-client)](https://goreportcard.com/report/Noooste/azuretls-client)
 [![License](https://img.shields.io/badge/License-MIT-blue.svg)](https://github.com/Noooste/azuretls-client/blob/master/LICENSE)

diff --git a/connection.go b/connection.go
@@ -316,7 +316,9 @@ func (s *Session) initConn(req *Request) (conn *Conn, err error) {
 				return nil, err
 			}
 		} else {
-			if conn.Conn, err = (&net.Dialer{Timeout: conn.TimeOut}).DialContext(s.ctx, "tcp", host); err != nil {
+			if conn.Conn, err = (&net.Dialer{
+				Timeout: conn.TimeOut,
+			}).DialContext(s.ctx, "tcp", host); err != nil {
 				return nil, err
 			}
 		}

diff --git a/test/connection_test.go b/test/connection_test.go
@@ -90,6 +90,13 @@ func concurrency(session *azuretls.Session, wg *sync.WaitGroup, ok *int64) bool
 			fmt.Println(err2)
 			return false
 		}
+
+		_, err2 = session.Get("http://example.com/")
+
+		if err2 != nil {
+			fmt.Println(err2)
+			return false
+		}
 	}
 
 	atomic.AddInt64(ok, 1)
@@ -107,7 +114,6 @@ func TestHighConcurrency(t *testing.T) {
 
 	wait.Add(int(count))
 
-	var err error
 	var ok = new(int64)
 
 	var i int64
@@ -118,12 +124,7 @@ func TestHighConcurrency(t *testing.T) {
 
 	wait.Wait()
 
-	if err != nil {
-		t.Error("TestHighConcurrency failed, expected: ", count, ", got: ", ok)
-		t.Fatal(err)
-	}
-
 	if atomic.LoadInt64(ok) < count-1 { //~1 request can fail
-		t.Fatal("TestHighConcurrency failed, expected: ", count, ", got: ", ok)
+		t.Fatal("TestHighConcurrency failed, expected: ", count, ", got: ", *ok)
 	}
 }
diff --git a/transport.go b/transport.go
@@ -1,10 +1,9 @@
 package azuretls
 
 import (
-	"context"
 	http "github.com/Noooste/fhttp"
 	"github.com/Noooste/fhttp/http2"
-	"net"
+	"net/url"
 )
 
 func (s *Session) initTransport(browser string) (err error) {
@@ -28,17 +27,11 @@ func (s *Session) initHTTP1() {
 	s.Transport = &http.Transport{
 		TLSHandshakeTimeout:   s.TimeOut,
 		ResponseHeaderTimeout: s.TimeOut,
-		DialTLSContext: func(ctx context.Context, network, addr string) (net.Conn, error) {
-			s.Connections.mu.RLock()
-			defer s.Connections.mu.RUnlock()
-			rc := s.Connections.hosts[addr]
-			return rc.TLS, nil
-		},
-		DialContext: func(ctx context.Context, network, addr string) (net.Conn, error) {
-			s.Connections.mu.RLock()
-			defer s.Connections.mu.RUnlock()
-			rc := s.Connections.hosts[addr]
-			return rc.Conn, nil
+		Proxy: func(req *http.Request) (*url.URL, error) {
+			if s.ProxyDialer == nil {
+				return nil, nil
+			}
+			return s.ProxyDialer.ProxyURL, nil
 		},
 	}
 }