update read response

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,
+	)
 }

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
+}

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)

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))
 }