From 985181e942f8af0eb42c5fdba93b5aab017b4336 Mon Sep 17 00:00:00 2001 From: Fedorov Vladimir Date: Mon, 21 Jul 2025 02:02:19 +0700 Subject: [PATCH 1/6] clear models --- http/client.go | 8 ++------ http/http.go | 12 +++++++++++- http/response.go | 6 ------ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/http/client.go b/http/client.go index 04b42ec..33fd6da 100644 --- a/http/client.go +++ b/http/client.go @@ -60,10 +60,11 @@ func ReadResponse(r io.Reader) (*Response, error) { if _, err := b.ReadString(' '); err != nil { return nil, errors.New("read httpVersion") } - statusCodeStr, err := b.ReadString(' ') + statusCode, err := b.ReadString(' ') if err != nil { return nil, errors.New("read statusCode") } + statusCode = statusCode[:len(statusCode)-1] if _, err := b.ReadString('\r'); err != nil { return nil, errors.New("read statusName") } @@ -71,11 +72,6 @@ func ReadResponse(r io.Reader) (*Response, error) { return nil, errors.New("read LF") } - statusCode, err := strconv.Atoi(statusCodeStr[:len(statusCodeStr)-1]) - if err != nil { - return nil, errors.New("read statusCode") - } - headerStr := "" contentLengthStr := "" headers := []Header{} diff --git a/http/http.go b/http/http.go index a5ce2a7..85a55a1 100644 --- a/http/http.go +++ b/http/http.go @@ -7,7 +7,17 @@ type Request struct { Headers []Header - Body string + Body []byte +} + +type Response struct { + Protocol string + StatusCode string + StatusMessage string + + Headers []Header + + Body []byte } type Header struct { diff --git a/http/response.go b/http/response.go index 8db8786..921caf6 100644 --- a/http/response.go +++ b/http/response.go @@ -8,12 +8,6 @@ var ( ErrHeaderNotFound = errors.New("header not found") ) -type Response struct { - StatusCode int - Headers []Header - Body []byte -} - func (r *Response) GetHeader(name string) (Header, error) { for _, h := range r.Headers { if h.Name == name { From 264dc51da4bd869023135fe7e2c1eecad1ed8ed9 Mon Sep 17 00:00:00 2001 From: Fedorov Vladimir Date: Mon, 21 Jul 2025 02:04:21 +0700 Subject: [PATCH 2/6] clear --- http/client.go | 63 --------------------------------------- http/client_test.go | 46 ----------------------------- http/read_response.go | 69 +++++++++++++++++++++++++++++++++++++++++++ http/response.go | 18 ----------- 4 files changed, 69 insertions(+), 127 deletions(-) delete mode 100644 http/client_test.go create mode 100644 http/read_response.go delete mode 100644 http/response.go diff --git a/http/client.go b/http/client.go index 33fd6da..3029700 100644 --- a/http/client.go +++ b/http/client.go @@ -1,11 +1,8 @@ package http import ( - "bufio" "errors" - "io" "net" - "strconv" "strings" ) @@ -53,63 +50,3 @@ func Do(method string, url string, headers []Header) (*Response, error) { ) return ReadResponse(conn) } - -func ReadResponse(r io.Reader) (*Response, error) { - b := bufio.NewReader(r) - - if _, err := b.ReadString(' '); err != nil { - return nil, errors.New("read httpVersion") - } - statusCode, err := b.ReadString(' ') - if err != nil { - return nil, errors.New("read statusCode") - } - statusCode = statusCode[:len(statusCode)-1] - if _, err := b.ReadString('\r'); err != nil { - return nil, errors.New("read statusName") - } - if _, err := b.ReadString('\n'); err != nil { - return nil, errors.New("read LF") - } - - headerStr := "" - contentLengthStr := "" - headers := []Header{} - for { - headerStr, err = b.ReadString('\n') - if err != nil { - return nil, errors.New("read header") - } - if headerStr == "\r\n" { - break - } - arr := strings.Split(headerStr, ": ") - value := strings.TrimSpace(arr[1]) - header := Header{Name: arr[0], Value: value} - if header.Name == "Content-Length" { - contentLengthStr = header.Value - } - headers = append(headers, header) - } - - length, err := strconv.Atoi(contentLengthStr) - if err != nil { - return nil, errors.New("read Content-Length") - } - - body := make([]byte, 0, length) - - for i := 0; i < length; i++ { - r, err := b.ReadByte() - if err != nil { - return nil, errors.New("read body") - } - body = append(body, r) - } - - return &Response{ - StatusCode: statusCode, - Headers: headers, - Body: body, - }, nil -} diff --git a/http/client_test.go b/http/client_test.go deleted file mode 100644 index 57d7183..0000000 --- a/http/client_test.go +++ /dev/null @@ -1,46 +0,0 @@ -package http - -import ( - "bytes" - "strings" - "testing" - - "github.com/stretchr/testify/assert" -) - -func Test_WriteRequest(t *testing.T) { - b := &strings.Builder{} - - WriteRequest( - b, - &Request{ - Method: "GET", - Path: "/", - Protocol: "HTTP/1.0", - }, - ) - - assert.Equal(t, "GET / HTTP/1.0\r\n\r\n", b.String()) -} - -func Test_ReadResponse(t *testing.T) { - b := bytes.NewBuffer( - []byte("HTTP/1.1 200 OK\r\nDate: Sat, 03 Feb 2024 16:40:29 GMT\r\nContent-Length: 12\r\nContent-Type: text/plain; charset=utf-8\r\n\r\nHello World!"), - ) - - r, err := ReadResponse(b) - assert.Nil(t, err) - - assert.Equal(t, 200, r.StatusCode) - - assert.Equal(t, "Date", r.Headers[0].Name) - assert.Equal(t, "Sat, 03 Feb 2024 16:40:29 GMT", r.Headers[0].Value) - - assert.Equal(t, "Content-Length", r.Headers[1].Name) - assert.Equal(t, "12", r.Headers[1].Value) - - assert.Equal(t, "Content-Type", r.Headers[2].Name) - assert.Equal(t, "text/plain; charset=utf-8", r.Headers[2].Value) - - assert.Equal(t, []byte("Hello World!"), r.Body) -} diff --git a/http/read_response.go b/http/read_response.go new file mode 100644 index 0000000..bd26c6e --- /dev/null +++ b/http/read_response.go @@ -0,0 +1,69 @@ +package http + +import ( + "bufio" + "errors" + "io" + "strconv" + "strings" +) + +func ReadResponse(r io.Reader) (*Response, error) { + b := bufio.NewReader(r) + + if _, err := b.ReadString(' '); err != nil { + return nil, errors.New("read httpVersion") + } + statusCode, err := b.ReadString(' ') + if err != nil { + return nil, errors.New("read statusCode") + } + statusCode = statusCode[:len(statusCode)-1] + if _, err := b.ReadString('\r'); err != nil { + return nil, errors.New("read statusName") + } + if _, err := b.ReadString('\n'); err != nil { + return nil, errors.New("read LF") + } + + headerStr := "" + contentLengthStr := "" + headers := []Header{} + for { + headerStr, err = b.ReadString('\n') + if err != nil { + return nil, errors.New("read header") + } + if headerStr == "\r\n" { + break + } + arr := strings.Split(headerStr, ": ") + value := strings.TrimSpace(arr[1]) + header := Header{Name: arr[0], Value: value} + if header.Name == "Content-Length" { + contentLengthStr = header.Value + } + headers = append(headers, header) + } + + length, err := strconv.Atoi(contentLengthStr) + if err != nil { + return nil, errors.New("read Content-Length") + } + + body := make([]byte, 0, length) + + for i := 0; i < length; i++ { + r, err := b.ReadByte() + if err != nil { + return nil, errors.New("read body") + } + body = append(body, r) + } + + return &Response{ + StatusCode: statusCode, + Headers: headers, + Body: body, + }, nil +} diff --git a/http/response.go b/http/response.go deleted file mode 100644 index 921caf6..0000000 --- a/http/response.go +++ /dev/null @@ -1,18 +0,0 @@ -package http - -import ( - "errors" -) - -var ( - ErrHeaderNotFound = errors.New("header not found") -) - -func (r *Response) GetHeader(name string) (Header, error) { - for _, h := range r.Headers { - if h.Name == name { - return h, nil - } - } - return Header{}, ErrHeaderNotFound -} From e72fa38b968cf71c13cd5260253026a4e108e6bf Mon Sep 17 00:00:00 2001 From: Fedorov Vladimir Date: Mon, 21 Jul 2025 02:16:17 +0700 Subject: [PATCH 3/6] update read response --- http/client.go | 22 +++++++++++++--------- http/read_response.go | 41 ++++++++++++++++++++++++++++++++++------- http/write_request.go | 2 +- test_client/main.go | 10 ++-------- 4 files changed, 50 insertions(+), 25 deletions(-) diff --git a/http/client.go b/http/client.go index 3029700..2ba1f06 100644 --- a/http/client.go +++ b/http/client.go @@ -6,19 +6,20 @@ import ( "strings" ) -var ( - CRLF = []byte("\r\n") - SP = []byte(" ") -) +type client struct{} -func getIP(domain string) string { +func NewClient() *client { + return &client{} +} + +func (c *client) getIP(domain string) string { if domain == "test.ru" { return "127.0.0.1:8081" } return "" } -func Do(method string, url string, headers []Header) (*Response, error) { +func (c *client) Do(method string, url string, headers []Header) (*Response, error) { url = strings.TrimPrefix(url, "http://") url = strings.TrimPrefix(url, "https://") path := "/" @@ -30,7 +31,7 @@ func Do(method string, url string, headers []Header) (*Response, error) { path = "/" + path } - connectPath := getIP(arr[0]) + connectPath := c.getIP(arr[0]) conn, err := net.Dial("tcp", connectPath) // conn, err := tls.Dial("tcp", connectPath, nil) if err != nil { @@ -38,7 +39,7 @@ func Do(method string, url string, headers []Header) (*Response, error) { } defer conn.Close() - DebugWrap( + WriteRequestDebugWrap( conn, &Request{ Method: method, @@ -48,5 +49,8 @@ func Do(method string, url string, headers []Header) (*Response, error) { }, WriteRequest, ) - return ReadResponse(conn) + return ReadResponseDebugWrap( + conn, + ReadResponse, + ) } diff --git a/http/read_response.go b/http/read_response.go index bd26c6e..12b49df 100644 --- a/http/read_response.go +++ b/http/read_response.go @@ -3,6 +3,7 @@ package http import ( "bufio" "errors" + "fmt" "io" "strconv" "strings" @@ -11,17 +12,24 @@ import ( func ReadResponse(r io.Reader) (*Response, error) { b := bufio.NewReader(r) - if _, err := b.ReadString(' '); err != nil { - return nil, errors.New("read httpVersion") + protocol, err := b.ReadString(' ') + if err != nil { + return nil, errors.New("read protocol") } + protocol = protocol[:len(protocol)-1] + statusCode, err := b.ReadString(' ') if err != nil { return nil, errors.New("read statusCode") } statusCode = statusCode[:len(statusCode)-1] - if _, err := b.ReadString('\r'); err != nil { - return nil, errors.New("read statusName") + + statusMessage, err := b.ReadString('\r') + if err != nil { + return nil, errors.New("read statusMessage") } + statusMessage = statusMessage[:len(statusMessage)-1] + if _, err := b.ReadString('\n'); err != nil { return nil, errors.New("read LF") } @@ -62,8 +70,27 @@ func ReadResponse(r io.Reader) (*Response, error) { } return &Response{ - StatusCode: statusCode, - Headers: headers, - Body: body, + Protocol: protocol, + StatusCode: statusCode, + StatusMessage: statusMessage, + Headers: headers, + Body: body, }, nil } + +func ReadResponseDebugWrap(r io.Reader, f func(r io.Reader) (*Response, error)) (*Response, error) { + resp, err := f(r) + if err != nil { + return nil, err + } + fmt.Println("----- Debug Info -----") + fmt.Printf("%s %s %s\n", resp.Protocol, resp.StatusCode, resp.StatusMessage) + for _, header := range resp.Headers { + fmt.Printf("%s: %s\n", header.Name, header.Value) + } + if len(resp.Body) > 0 { + fmt.Println(string(resp.Body)) + } + fmt.Println("----- Debug End Info -----") + return resp, nil +} diff --git a/http/write_request.go b/http/write_request.go index 841b008..b59f5cb 100644 --- a/http/write_request.go +++ b/http/write_request.go @@ -19,7 +19,7 @@ func WriteRequest(w io.Writer, req *Request) { } } -func DebugWrap(w io.Writer, req *Request, f func(w io.Writer, req *Request)) { +func WriteRequestDebugWrap(w io.Writer, req *Request, f func(w io.Writer, req *Request)) { buffer := &bytes.Buffer{} f(buffer, req) diff --git a/test_client/main.go b/test_client/main.go index 13f3650..5215acb 100644 --- a/test_client/main.go +++ b/test_client/main.go @@ -1,13 +1,12 @@ package main import ( - "fmt" - "git.3crabs.ru/VLADIMIR/net/http" ) func main() { - r, err := http.Do( + client := http.NewClient() + _, err := client.Do( "GET", "http://test.ru", []http.Header{ @@ -19,9 +18,4 @@ func main() { if err != nil { panic(err) } - fmt.Println(r.StatusCode) - for _, header := range r.Headers { - fmt.Println(header) - } - fmt.Println(string(r.Body)) } From 6a17a02900cebf93701f97e982794e1a67fd7b4e Mon Sep 17 00:00:00 2001 From: Fedorov Vladimir Date: Mon, 21 Jul 2025 02:30:26 +0700 Subject: [PATCH 4/6] clear --- http/client.go | 32 +++++++++++++++++--------------- test_client/main.go | 2 +- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/http/client.go b/http/client.go index 2ba1f06..25bfdb9 100644 --- a/http/client.go +++ b/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) { - url = strings.TrimPrefix(url, "http://") - url = strings.TrimPrefix(url, "https://") - path := "/" - arr := strings.Split(url, "/") - if len(arr) == 2 { - path = arr[1] - } - if !strings.HasPrefix(path, "/") { - path = "/" + path +func (c *client) Do(method string, rawURl string, headers []Header) (*Response, error) { + u, err := url.Parse(rawURl) + if err != nil { + return nil, err } - connectPath := c.getIP(arr[0]) - conn, err := net.Dial("tcp", connectPath) - // conn, err := tls.Dial("tcp", connectPath, nil) + connectPath := c.getIP(u.Host) + var conn net.Conn + 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, }, diff --git a/test_client/main.go b/test_client/main.go index 5215acb..ae2e3d4 100644 --- a/test_client/main.go +++ b/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"}, From b897a4dfda5481f04e716f503d7b634bd399bd70 Mon Sep 17 00:00:00 2001 From: Fedorov Vladimir Date: Mon, 21 Jul 2025 02:35:32 +0700 Subject: [PATCH 5/6] clear --- go.mod | 8 -------- go.sum | 9 --------- 2 files changed, 17 deletions(-) diff --git a/go.mod b/go.mod index e3bf4c4..3a39dec 100644 --- a/go.mod +++ b/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 -) diff --git a/go.sum b/go.sum index 8cf6655..e69de29 100644 --- a/go.sum +++ b/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= From 78cf1e5e3ff4402ff906328c5a52a25ba56777b9 Mon Sep 17 00:00:00 2001 From: Fedorov Vladimir Date: Mon, 21 Jul 2025 03:10:02 +0700 Subject: [PATCH 6/6] add url package --- http/client.go | 3 ++- url/examples/main.go | 15 +++++++++++++++ url/url.go | 31 +++++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 url/examples/main.go create mode 100644 url/url.go diff --git a/http/client.go b/http/client.go index 25bfdb9..36afcd2 100644 --- a/http/client.go +++ b/http/client.go @@ -4,7 +4,8 @@ import ( "crypto/tls" "errors" "net" - "net/url" + + "git.3crabs.ru/VLADIMIR/net/url" ) type client struct{} diff --git a/url/examples/main.go b/url/examples/main.go new file mode 100644 index 0000000..4aa9c33 --- /dev/null +++ b/url/examples/main.go @@ -0,0 +1,15 @@ +package main + +import ( + "fmt" + + "git.3crabs.ru/VLADIMIR/net/url" +) + +func main() { + u, err := url.Parse("http://test.ru/") + if err != nil { + panic(err) + } + fmt.Printf("%+v", u) +} diff --git a/url/url.go b/url/url.go new file mode 100644 index 0000000..7b31ac8 --- /dev/null +++ b/url/url.go @@ -0,0 +1,31 @@ +package url + +type URL struct { + Scheme string + Host string + Path string +} + +func Parse(rawURL string) (*URL, error) { + schemeIndex := -1 + hostStartIndex := -1 + hostEndIndex := -1 + for i := 0; i < len(rawURL); i++ { + if schemeIndex == -1 && rawURL[i] == ':' { + schemeIndex = i + hostStartIndex = i + 3 + i += 3 + continue + } + if rawURL[i] == '/' { + hostEndIndex = i + break + } + } + + return &URL{ + Scheme: rawURL[:schemeIndex], + Host: rawURL[hostStartIndex:hostEndIndex], + Path: rawURL[hostEndIndex:], + }, nil +}