clear

go.mod

@@ -1,11 +1,3 @@
 module git.3crabs.ru/VLADIMIR/net
 
 go 1.20
-
-require github.com/stretchr/testify v1.8.4
-
-require (
-	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/pmezard/go-difflib v1.0.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
-)

go.sum

@@ -1,9 +0,0 @@
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
-github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

http/client.go

@@ -1,9 +1,10 @@
 package http
 
 import (
+	"crypto/tls"
 	"errors"
 	"net"
-	"strings"
+	"net/url"
 )
 
 type client struct{}
@@ -19,21 +20,22 @@ func (c *client) getIP(domain string) string {
 	return ""
 }
 
-func (c *client) Do(method string, url string, headers []Header) (*Response, error) {
+func (c *client) Do(method string, rawURl string, headers []Header) (*Response, error) {
-	url = strings.TrimPrefix(url, "http://")
+	u, err := url.Parse(rawURl)
-	url = strings.TrimPrefix(url, "https://")
+	if err != nil {
-	path := "/"
+		return nil, err
-	arr := strings.Split(url, "/")
-	if len(arr) == 2 {
-		path = arr[1]
-	}
-	if !strings.HasPrefix(path, "/") {
-		path = "/" + path
 	}
 
-	connectPath := c.getIP(arr[0])
+	connectPath := c.getIP(u.Host)
-	conn, err := net.Dial("tcp", connectPath)
+	var conn net.Conn
-	// conn, err := tls.Dial("tcp", connectPath, nil)
+	switch u.Scheme {
+	case "http":
+		conn, err = net.Dial("tcp", connectPath)
+	case "https":
+		conn, err = tls.Dial("tcp", connectPath, nil)
+	default:
+		panic("scheme not support")
+	}
 	if err != nil {
 		return nil, errors.New("connect " + connectPath)
 	}
@@ -43,7 +45,7 @@ func (c *client) Do(method string, url string, headers []Header) (*Response, err
 		conn,
 		&Request{
 			Method:   method,
-			Path:     path,
+			Path:     u.Path,
 			Protocol: "HTTP/1.0",
 			Headers:  headers,
 		},

test_client/main.go

@@ -8,7 +8,7 @@ func main() {
 	client := http.NewClient()
 	_, err := client.Do(
 		"GET",
-		"http://test.ru",
+		"http://test.ru/",
 		[]http.Header{
 			{Name: "Host", Value: "3crabs.ru"},
 			{Name: "User-Agent", Value: "3crabs/0.0.1"},