VLADIMIR/net
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add client and transport

Browse Source
This commit is contained in:
Владимир Фёдоров 2025-10-19 13:05:29 +07:00
parent 729015c4ea
commit 6d1bf72d9d
9 changed files with 168 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
http/client.go
View File

@ -1,11 +1,6 @@
package http
import (
"bufio"
"errors"
"io"
"net"
"strconv"
"strings"
)
@ -14,14 +9,12 @@ var (
SP = []byte(" ")
)
func getIP(domain string) string {
if domain == "test.ru" {
return "127.0.0.1:8081"
}
return ""
type Client struct {
DNS DNS
Transport RoundTripper
}
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 := "/"
@ -33,87 +26,23 @@ func Do(method string, url string, headers []Header) (*Response, error) {
path = "/" + path
}
connectPath := getIP(arr[0])
conn, err := net.Dial("tcp", connectPath)
// conn, err := tls.Dial("tcp", connectPath, nil)
if err != nil {
return nil, errors.New("connect " + connectPath)
connectPath := ""
if c.DNS != nil {
var err error
connectPath, err = c.DNS.GetIP(arr[0])
if err != nil {
return nil, err
}
}
defer conn.Close()
DebugWrap(
conn,
resp, err := c.Transport.RoundTrip(
&Request{
Method: method,
Path: path,
Protocol: "HTTP/1.0",
Headers: headers,
ConnectPath: connectPath,
Method: method,
Path: path,
Protocol: "HTTP/1.0",
Headers: headers,
},
WriteRequest,
)
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")
}
statusCodeStr, 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")
}
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{}
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
return resp, err
}

5
http/dns.go Normal file
View File

@ -0,0 +1,5 @@
package http
type DNS interface {
GetIP(domain string) (string, error)
}

6
http/header.go Normal file
View File

@ -0,0 +1,6 @@
package http
type Header struct {
Name string
Value string
}

7
http/http.go → http/request.go
View File

@ -1,6 +1,8 @@
package http
type Request struct {
ConnectPath string // ip
Method string
Path string
Protocol string
@ -9,8 +11,3 @@ type Request struct {
Body string
}
type Header struct {
Name string
Value string
}

5
http/round_tripper.go Normal file
View File

@ -0,0 +1,5 @@
package http
type RoundTripper interface {
RoundTrip(*Request) (*Response, error)
}

115
http/transport.go Normal file
View File

@ -0,0 +1,115 @@
package http
import (
"bufio"
"bytes"
"errors"
"fmt"
"io"
"net"
"strconv"
"strings"
)
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)
if err != nil {
return nil, errors.New("connect " + req.ConnectPath)
}
defer conn.Close()
debugWrap(conn, req, writeRequest)
return readResponse(conn)
}
func writeRequest(w io.Writer, req *Request) {
fmt.Fprintf(w, "%s %s %s\r\n", req.Method, req.Path, req.Protocol)
for _, header := range req.Headers {
fmt.Fprintf(w, "%s: %s\r\n", header.Name, header.Value)
}
fmt.Fprintf(w, "\r\n")
if len(req.Body) > 0 {
fmt.Fprintf(w, "%s\r\n", req.Body)
}
}
func debugWrap(w io.Writer, req *Request, f func(w io.Writer, req *Request)) {
buffer := &bytes.Buffer{}
f(buffer, req)
fmt.Println("----- Debug Info -----")
fmt.Println(buffer.String())
fmt.Println("----- Debug End Info -----")
w.Write(buffer.Bytes())
}
func readResponse(r io.Reader) (*Response, error) {
b := bufio.NewReader(r)
if _, err := b.ReadString(' '); err != nil {
return nil, errors.New("read httpVersion")
}
statusCodeStr, 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")
}
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{}
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
}

4
http/client_test.go → http/transport_test.go
View File

@ -11,7 +11,7 @@ import (
func Test_WriteRequest(t *testing.T) {
b := &strings.Builder{}
WriteRequest(
writeRequest(
b,
&Request{
Method: "GET",
@ -28,7 +28,7 @@ func Test_ReadResponse(t *testing.T) {
[]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)
r, err := readResponse(b)
assert.Nil(t, err)
assert.Equal(t, 200, r.StatusCode)

32
http/write_request.go
View File

@ -1,32 +0,0 @@
package http
import (
"bytes"
"fmt"
"io"
)
func WriteRequest(w io.Writer, req *Request) {
fmt.Fprintf(w, "%s %s %s\r\n", req.Method, req.Path, req.Protocol)
for _, header := range req.Headers {
fmt.Fprintf(w, "%s: %s\r\n", header.Name, header.Value)
}
fmt.Fprintf(w, "\r\n")
if len(req.Body) > 0 {
fmt.Fprintf(w, "%s\r\n", req.Body)
}
}
func DebugWrap(w io.Writer, req *Request, f func(w io.Writer, req *Request)) {
buffer := &bytes.Buffer{}
f(buffer, req)
fmt.Println("----- Debug Info -----")
fmt.Println(buffer.String())
fmt.Println("----- Debug End Info -----")
w.Write(buffer.Bytes())
}

16
test_client/main.go
View File

@ -1,13 +1,27 @@
package main
import (
"errors"
"fmt"
"git.3crabs.ru/VLADIMIR/net/http"
)
type CustomDNS struct{}
func (*CustomDNS) GetIP(domain string) (string, error) {
if domain == "test.ru" {
return "127.0.0.1:8081", nil
}
return "", errors.New("ip not found")
}
func main() {
r, err := http.Do(
client := http.Client{
DNS: &CustomDNS{},
Transport: &http.HttpTransport{},
}
r, err := client.Do(
"GET",
"http://test.ru",
[]http.Header{