diff --git a/api.go b/api.go index 9a2babc..28efe22 100644 --- a/api.go +++ b/api.go @@ -16,6 +16,53 @@ type ApiResponse struct { Result any `json:"result,omitempty"` ErrorCode int `json:"error_code,omitempty"` } +type ApiResponseG[R any] struct { + Ok bool `json:"ok"` + Description string `json:"description,omitempty"` + Result R `json:"result,omitempty"` + ErrorCode int `json:"error_code,omitempty"` +} + +type TelegramRequest[R, P any] struct { + method string + params P +} +type EmptyParams struct{} + +func NewRequest[R, P any](method string, params P) TelegramRequest[R, P] { + return TelegramRequest[R, P]{ + method: method, + params: params, + } +} +func (r TelegramRequest[R, P]) Do(bot *Bot) (*R, error) { + var buf bytes.Buffer + err := json.NewEncoder(&buf).Encode(r.params) + if err != nil { + return nil, err + } + + req, err := http.Post(fmt.Sprintf("https://api.telegram.org/bot%s/%s", bot.token, r.method), "application/json", &buf) + if err != nil { + return nil, err + } + defer req.Body.Close() + data, err := io.ReadAll(req.Body) + if err != nil { + return nil, err + } + + response := new(ApiResponseG[R]) + err = json.Unmarshal(data, &response) + if err != nil { + return nil, err + } + + if !response.Ok { + return nil, fmt.Errorf("[%d] %s", response.ErrorCode, response.Description) + } + return &response.Result, nil +} // request is a low-level call to api. func (b *Bot) request(methodName string, params any) (map[string]any, error) { diff --git a/methods.go b/methods.go index f80cfa7..46c14ae 100644 --- a/methods.go +++ b/methods.go @@ -22,7 +22,7 @@ func (b *Bot) Updates() ([]*Update, error) { if err != nil { return res, err } - + for _, u := range res { b.updateOffset = u.UpdateID + 1 err = b.updateQueue.Enqueue(u) @@ -43,6 +43,8 @@ func (b *Bot) Updates() ([]*Update, error) { } func (b *Bot) GetMe() (*User, error) { + //req := NewRequest[User, EmptyParams]("getMe", EmptyParams{}) + //user, err := req.Do(b) data, err := b.request("getMe", NoParams) if err != nil { return nil, err @@ -69,6 +71,9 @@ type SendMessageP struct { } func (b *Bot) SendMessage(params *SendMessageP) (*Message, error) { + req := NewRequest[Message, SendMessageP]("sendMessage", *params) + return req.Do(b) + data, err := b.request("sendMessage", params) if err != nil { return nil, err diff --git a/runners.go b/runners.go index 75daaa2..64988ec 100644 --- a/runners.go +++ b/runners.go @@ -61,10 +61,15 @@ func (b *Bot) ExecRunners() { } }() } else if !runner.Async && runner.Onetime { + t := time.Now() err := runner.Fn(b) if err != nil { b.logger.Warnf("Runner %s failed: %s\n", runner.Name, err) } + elapsed := time.Since(t) + if elapsed > time.Second*2 { + b.logger.Warnf("Runner %s too slow. Elapsed time %s>=2s", runner.Name, elapsed) + } } else if !runner.Onetime { go func() { for {