update read response
This commit is contained in:
+34
-7
@@ -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
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user