Merge branch 'master' of https://git.3crabs.ru/VLADIMIR/net

http/transport.go

@@ -3,6 +3,7 @@ package http
 import (
 	"bufio"
 	"bytes"
+	"crypto/tls"
 	"errors"
 	"fmt"
 	"io"
@@ -14,19 +15,28 @@ import (
 type HttpTransport struct{}
 
 func (t *HttpTransport) RoundTrip(req *Request) (*Response, error) {
-	conn, err := net.Dial("tcp", req.ConnectPath)
-	// conn, err := tls.Dial("tcp", connectPath, nil)
+	var err error
+	var conn net.Conn
+	switch req.URL.Scheme {
+	case "http":
+		conn, err = net.Dial("tcp", req.ConnectPath)
+	case "https":
+		conn, err = tls.Dial("tcp", req.ConnectPath, nil)
+	default:
+		panic("scheme not support")
+	}
 	if err != nil {
 		return nil, errors.New("connect " + req.ConnectPath)
 	}
+
 	defer conn.Close()
 
-	debugWrap(conn, req, writeRequest)
-	return readResponse(conn)
+	WriteRequestDebugWrap(conn, req, WriteRequest)
+	return ReadResponseDebugWrap(conn, ReadResponse)
 }
 
-func writeRequest(w io.Writer, req *Request) {
-	fmt.Fprintf(w, "%s %s %s\r\n", req.Method, req.Path, req.Protocol)
+func WriteRequest(w io.Writer, req *Request) {
+	fmt.Fprintf(w, "%s %s %s\r\n", req.Method, req.URL.Path, req.Protocol)
 
 	for _, header := range req.Headers {
 		fmt.Fprintf(w, "%s: %s\r\n", header.Name, header.Value)
@@ -38,7 +48,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)
@@ -50,28 +60,31 @@ func debugWrap(w io.Writer, req *Request, f func(w io.Writer, req *Request)) {
 	w.Write(buffer.Bytes())
 }
 
-func readResponse(r io.Reader) (*Response, error) {
+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")
 	}
-	statusCodeStr, err := b.ReadString(' ')
+	protocol = protocol[:len(protocol)-1]
+
+	statusCode, err := b.ReadString(' ')
 	if err != nil {
 		return nil, errors.New("read statusCode")
 	}
-	if _, err := b.ReadString('\r'); err != nil {
-		return nil, errors.New("read statusName")
+	statusCode = statusCode[:len(statusCode)-1]
+
+	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")
 	}
 
-	statusCode, err := strconv.Atoi(statusCodeStr[:len(statusCodeStr)-1])
-	if err != nil {
-		return nil, errors.New("read statusCode")
-	}
-
 	headerStr := ""
 	contentLengthStr := ""
 	headers := []Header{}
@@ -108,8 +121,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
+}