packages
/
curl
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

process... (not ended context deadline)

main
loveckiy.ivan 11 months ago
parent
254d69267b
commit
c6a17eb4ef
4 changed files with 142 additions and 134 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 51
      builder.go
  2. 63
      client.go
  3. 39
      curl.go
  4. 123
      request.go

51
builder.go
View File

@ -1,51 +0,0 @@
package curl
import "net/http"
type Builder interface {
Method(value string) Builder
Url(value string) Builder
}
type builder struct {
method, url, payload string
response interface{}
headers map[string]string
cookies []*http.Cookie
}
func (b *builder) Method(value string) Builder {
return &builder{
method: value,
}
}
func (b *builder) Url(value string) Builder {
return &builder{
url: value,
}
}
func (b *builder) Payload(value string) Builder {
return &builder{
payload: value,
}
}
func (b *builder) MapToObj(value string) Builder {
return &builder{
payload: value,
}
}
func (b *builder) Headers(value string) Builder {
return &builder{
payload: value,
}
}
func (b *builder) Cookies(value string) Builder {
return &builder{
payload: value,
}
}

63
client.go
View File

@ -0,0 +1,63 @@
package curl
import (
"crypto/tls"
"net/http"
"time"
)
const shortDuration = 1 * time.Second
var defaultRequestClient RequestClient
type RequestClient struct {
client http.Client
}
func (r *RequestClient) NewRequest() *request {
cloneRequest := defaultRequestClient.clone()
return &request{
client: cloneRequest.client,
}
}
func (r *RequestClient) clone() RequestClient {
return RequestClient{
client: r.client,
}
}
// RegisterDefaultClient регистрируем клиента по-умолчанию
func RegisterDefaultClient(timeout time.Duration) {
defaultRequestClient = NewClient(timeout)
return
}
// NewRequestDefault создаем запрос используя дефалтового клиента
func NewRequestDefault() *request {
cloneRequest := defaultRequestClient.clone()
return &request{
client: cloneRequest.client,
}
}
// NewClient создаем нового клиента
func NewClient(timeout time.Duration) RequestClient {
if timeout == 0 {
timeout = 2 * time.Second
}
return RequestClient{
client: http.Client{
Transport: &http.Transport{
TLSClientConfig: &tls.Config{
InsecureSkipVerify: true,
},
},
Timeout: timeout,
},
}
}

39
curl.go
View File

@ -1,39 +0,0 @@
package curl
import (
"crypto/tls"
"net/http"
"time"
)
const shortDuration = 1 * time.Second
type RequestClient struct {
client http.Client
builder
}
var defaultRequestClient RequestClient
// Register регистрируем клиента по-умолчанию
func Register(timeout time.Duration) {
defaultRequestClient = NewClient(timeout)
return
}
func NewClient(timeout time.Duration) RequestClient {
if timeout == 0 {
timeout = 2 * time.Second
}
return RequestClient{
client: http.Client{
Transport: &http.Transport{
TLSClientConfig: &tls.Config{
InsecureSkipVerify: true,
},
},
Timeout: timeout,
},
}
}

123
methods.go → request.go
View File

@ -5,37 +5,90 @@ import (
"encoding/json"
"fmt"
"io/ioutil"
"net"
"net/http"
"net/url"
"strings"
"time"
)
type request struct {
method, url, payload string
response interface{}
headers map[string]string
cookies []*http.Cookie
client http.Client
}
type Builder interface {
Method(value string) Builder
Url(value string) Builder
Payload(value string) Builder
MapToObj(value interface{}) Builder
Headers(value map[string]string) Builder
Cookies(value []*http.Cookie) Builder
Do(ctx context.Context) (result interface{}, err error)
}
func (b *request) Method(value string) Builder {
b.method = value
return b
}
func (b *request) Url(value string) Builder {
b.url = value
return b
}
func (b *request) Payload(value string) Builder {
b.payload = value
return b
}
func (b *request) MapToObj(value interface{}) Builder {
b.response = value
return b
}
func (b *request) Headers(value map[string]string) Builder {
b.headers = value
return b
}
func (b *request) Cookies(value []*http.Cookie) Builder {
b.cookies = value
return b
}
// Do всегде возвращает результат в интерфейс + ошибка (полезно для внешних запросов с неизвестной структурой)
// сериализуем в объект, при передаче ссылки на переменную типа
func (r *RequestClient) Do(ctx context.Context, method, urlc, bodyJSON string, response interface{}, headers map[string]string, cookies []*http.Cookie) (result interface{}, err error) {
func (r *request) Do(ctx context.Context) (result interface{}, err error) {
var mapValues map[string]string
var req *http.Request
if method == "" {
method = "POST"
if r.method == "" {
r.method = http.MethodPost
}
if r.url == "" {
return nil, fmt.Errorf("error do request. param URL is empty")
}
method = strings.Trim(method, " ")
values := url.Values{}
actionType := ""
// если в гете мы передали еще и json (его добавляем в строку запроса)
// только если в запросе не указаны передаваемые параметры
clearUrl := strings.Contains(urlc, "?")
clearUrl := strings.Contains(r.url, "?")
bodyJSON = strings.Replace(bodyJSON, " ", "", -1)
err = json.Unmarshal([]byte(bodyJSON), &mapValues)
r.payload = strings.Replace(r.payload, " ", "", -1)
err = json.Unmarshal([]byte(r.payload), &mapValues)
if method == "JSONTOGET" && bodyJSON != "" && clearUrl {
if r.method == "JSONTOGET" && r.payload != "" && clearUrl {
actionType = "JSONTOGET"
}
if method == "JSONTOPOST" && bodyJSON != "" {
if r.method == "JSONTOPOST" && r.payload != "" {
actionType = "JSONTOPOST"
}
@ -45,10 +98,10 @@ func (r *RequestClient) Do(ctx context.Context, method, urlc, bodyJSON string, r
for k, v := range mapValues {
values.Set(k, v)
}
uri, _ := url.Parse(urlc)
uri, _ := url.Parse(r.url)
uri.RawQuery = values.Encode()
urlc = uri.String()
req, err = http.NewRequest("GET", urlc, strings.NewReader(bodyJSON))
r.url = uri.String()
req, err = http.NewRequest("GET", r.url, strings.NewReader(r.payload))
if err != nil {
return "", fmt.Errorf("error do request, err: %s", err)
}
@ -60,7 +113,7 @@ func (r *RequestClient) Do(ctx context.Context, method, urlc, bodyJSON string, r
for k, v := range mapValues {
values.Set(k, v)
}
req, err = http.NewRequest("POST", urlc, strings.NewReader(values.Encode()))
req, err = http.NewRequest("POST", r.url, strings.NewReader(values.Encode()))
if err != nil {
return "", fmt.Errorf("error do request, err: %s", err)
}
@ -71,46 +124,34 @@ func (r *RequestClient) Do(ctx context.Context, method, urlc, bodyJSON string, r
fmt.Println("Error! Fail parsed bodyJSON to POST: ", err)
}
default:
req, err = http.NewRequest(method, urlc, strings.NewReader(bodyJSON))
req, err = http.NewRequest(r.method, r.url, strings.NewReader(r.payload))
if err != nil {
return "", fmt.Errorf("error do request, err: %s", err)
}
}
// дополняем переданными заголовками
if len(headers) > 0 {
for k, v := range headers {
if len(r.headers) > 0 {
for k, v := range r.headers {
req.Header.Add(k, v)
}
}
// дополянем куками назначенными для данного запроса
if cookies != nil {
for _, v := range cookies {
if r.cookies != nil {
for _, v := range r.cookies {
req.AddCookie(v)
}
}
ctx, cancel := context.WithTimeout(req.Context(), shortDuration)
defer cancel()
endpoint := urlc
endpoint = strings.Replace(endpoint, "https://", "", 1)
endpoint = strings.Replace(endpoint, "http://", "", 1)
endpoint = strings.Replace(endpoint, "/ping", "", 1)
conn, err := net.Dial("tcp", endpoint)
if err != nil {
fmt.Printf("closed url %s, err: %s\n", urlc, err)
return "", fmt.Errorf("connect is closed", err)
if ctx == nil {
ctx, _ = context.WithTimeout(context.Background(), 10*time.Second)
}
defer conn.Close()
conn.SetDeadline(time.Now().Add(time.Millisecond * 100))
req = req.WithContext(ctx)
client := http.DefaultClient
req.Close = true
resp, err := client.Do(req)
resp, err := r.client.Do(req)
if err != nil {
return "", fmt.Errorf("error do request, err: %s", err)
}
@ -123,21 +164,15 @@ func (r *RequestClient) Do(ctx context.Context, method, urlc, bodyJSON string, r
responseString := string(responseData)
// возвращаем объект ответа, если передано - в какой объект класть результат
if response != nil {
json.Unmarshal([]byte(responseString), &response)
if r.response != nil {
json.Unmarshal([]byte(responseString), &r.response)
}
// всегда отдаем в интерфейсе результат (полезно, когда внешние запросы или сериализация на клиенте)
//json.Unmarshal([]byte(responseString), &result)
if resp.StatusCode != 200 {
err = fmt.Errorf("request is not success. request:%s, status: %s", urlc, resp.Status)
err = fmt.Errorf("request is not success (do request). request: %s, status: %s", r.url, resp.Status)
}
return responseString, err
}
func (r *RequestClient) Clone() RequestClient {
return RequestClient{
client: r.client,
}
}
Write Preview
Loading…
Cancel
Save