Skip to content

fix: #224 #272

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Flipped199 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: #224 #272

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
79 changes: 48 additions & 31 deletions raw_request.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,30 @@ type apiResponse struct {
}

func (b *Bot) rawRequest(ctx context.Context, method string, params any, dest any) error {
pr, pw := io.Pipe()
form := multipart.NewWriter(pw)
u := b.url + "/bot" + b.token + "/"
if b.testEnvironment {
u += "test/"
}
u += method

if b.isDebug && strings.ToLower(method) != "getupdates" {
requestDebugData, _ := json.Marshal(params)
b.debugHandler("request url: %s, payload: %s", strings.Replace(u, b.token, "***", 1), requestDebugData)
}

var req *http.Request
var errRequest error

go func() {
if params != nil && !reflect.ValueOf(params).IsNil() {
if isNil(params) {
req, errRequest = http.NewRequestWithContext(ctx, http.MethodPost, u, nil)
if errRequest != nil {
return fmt.Errorf("error create request for method %s, %w", method, errRequest)
}
} else {
pr, pw := io.Pipe()
form := multipart.NewWriter(pw)

go func() {
_, 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 {
Expand All @@ -39,47 +58,32 @@ func (b *Bot) rawRequest(ctx context.Context, method string, params any, dest an
return
}

errFormClose := form.Close()
if errFormClose != nil {
if errClose := pw.CloseWithError(fmt.Errorf("error form close for method %s, %w", method, errFormClose)); errClose != nil {
if err := form.Close(); err != nil {
if errClose := pw.CloseWithError(fmt.Errorf("error form close for method %s, %w", method, err)); errClose != nil {
b.errorsHandler(fmt.Errorf("error close pipe writer for method %s, %w", method, errClose))
}
return
}
}
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 {
u += "test/"
}
u += method
if errClose := pw.Close(); errClose != nil {
b.errorsHandler(fmt.Errorf("error close pipe writer for method %s, %w", method, errClose))
}
}()

if b.isDebug && strings.ToLower(method) != "getupdates" {
requestDebugData, _ := json.Marshal(params)
b.debugHandler("request url: %s, payload: %s", strings.Replace(u, b.token, "***", 1), requestDebugData)
}
req, errRequest = http.NewRequestWithContext(ctx, http.MethodPost, u, pr)
if errRequest != nil {
return fmt.Errorf("error create request for method %s, %w", method, errRequest)
}

req, errRequest := http.NewRequestWithContext(ctx, http.MethodPost, u, pr)
if errRequest != nil {
return fmt.Errorf("error create request for method %s, %w", method, errRequest)
req.Header.Add("Content-Type", form.FormDataContentType())
}

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))
}
var netErr *url.Error
if errors.As(errDo, &netErr) {
netErr.URL = strings.Replace(netErr.URL, b.token, "***", -1)
}

return fmt.Errorf("error do request for method %s, %w", method, errDo)
}
defer func() {
Expand Down Expand Up @@ -110,7 +114,6 @@ func (b *Bot) rawRequest(ctx context.Context, method string, params any, dest an
Message: fmt.Sprintf("%s: %s", ErrorBadRequest, r.Description),
MigrateToChatID: r.Parameters.MigrateToChatID,
}

return err
}
return fmt.Errorf("%w, %s", ErrorBadRequest, r.Description)
Expand Down Expand Up @@ -146,3 +149,17 @@ func (b *Bot) rawRequest(ctx context.Context, method string, params any, dest an

return nil
}

func isNil(v any) bool {
if v == nil {
return true
}

rv := reflect.ValueOf(v)
switch rv.Kind() {
case reflect.Chan, reflect.Func, reflect.Interface, reflect.Map, reflect.Pointer, reflect.Slice:
return rv.IsNil()
default:
return false
}
}