Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 27 additions & 23 deletions raw_request.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,28 +24,31 @@ type apiResponse struct {
}

func (b *Bot) rawRequest(ctx context.Context, method string, params any, dest any) error {
var httpBody io.Reader = http.NoBody
var contentType string

if params != nil && !reflect.ValueOf(params).IsNil() {
buf := bytes.NewBuffer(nil)
form := multipart.NewWriter(buf)

fieldsCount, errFormData := buildRequestForm(form, params)
if errFormData != nil {
return fmt.Errorf("error build request form for method %s, %w", method, errFormData)
}
pr, pw := io.Pipe()
form := multipart.NewWriter(pw)

go func() {
if params != nil && !reflect.ValueOf(params).IsNil() {
_, errFormData := buildRequestForm(form, params)
if errFormData != nil {
if errClose := pw.CloseWithError(fmt.Errorf("error build request form for method %s, %w", method, errFormData)); errClose != nil {
b.errorsHandler(fmt.Errorf("error close pipe writer for method %s, %w", method, errClose))
}
return
}

errFormClose := form.Close()
if errFormClose != nil {
return fmt.Errorf("error form close for method %s, %w", method, errFormClose)
errFormClose := form.Close()
if errFormClose != nil {
if errClose := pw.CloseWithError(fmt.Errorf("error form close for method %s, %w", method, errFormClose)); errClose != nil {
b.errorsHandler(fmt.Errorf("error close pipe writer for method %s, %w", method, errClose))
}
return
}
}

if fieldsCount > 0 {
httpBody = buf
contentType = form.FormDataContentType()
if errClose := pw.Close(); errClose != nil {
b.errorsHandler(fmt.Errorf("error close pipe writer for method %s, %w", method, errClose))
}
}
}()

u := b.url + "/bot" + b.token + "/"
if b.testEnvironment {
Expand All @@ -58,17 +61,18 @@ func (b *Bot) rawRequest(ctx context.Context, method string, params any, dest an
b.debugHandler("request url: %s, payload: %s", u, requestDebugData)
}

req, errRequest := http.NewRequestWithContext(ctx, http.MethodPost, u, httpBody)
req, errRequest := http.NewRequestWithContext(ctx, http.MethodPost, u, pr)
if errRequest != nil {
return fmt.Errorf("error create request for method %s, %w", method, errRequest)
}

if contentType != "" {
req.Header.Add("Content-Type", contentType)
}
req.Header.Add("Content-Type", form.FormDataContentType())

resp, errDo := b.client.Do(req)
if errDo != nil {
if errClose := pr.CloseWithError(errDo); errClose != nil {
b.errorsHandler(fmt.Errorf("error close pipe reader for method %s, %w", method, errClose))
}
return fmt.Errorf("error do request for method %s, %w", method, errDo)
}
defer func() {
Expand Down
Loading