diamondburned/arikawa
1
0
Fork 0
mirror of https://github.com/diamondburned/arikawa.git synced 2025-01-05 19:57:02 +00:00
Code Issues Releases Activity

API: V8 breaking rate limit changes

Browse source 
This commit updates Retry-After to be seconds-accurate instead of the
previous millisecond-accurate. Another issue (#153) is opened to get a
more accurate number, which is in the JSON body instead of the header.

This commit also removed the rate limit precision header. It also uses a
more accurate calculation algorithm to derive the reset time.
This commit is contained in:
diamondburned 2020-10-28 14:31:15 -07:00
parent d405cc22b7
commit 2af51c9a5a
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
api/api.go
View file

@ -68,9 +68,8 @@ type Session struct {
func (s *Session) InjectRequest(r httpdriver.Request) error {
r.AddHeader(http.Header{
"Authorization": {s.Token},
"User-Agent": {s.UserAgent},
"X-RateLimit-Precision": {"millisecond"},
"Authorization": {s.Token},
"User-Agent": {s.UserAgent},
})
// Rate limit stuff

17
api/rate/rate.go
View file

@ -9,13 +9,12 @@ import (
"sync/atomic"
"time"
"github.com/pkg/errors"
"github.com/diamondburned/arikawa/internal/moreatomic"
"github.com/pkg/errors"
)
// ExtraDelay because Discord is trash. I've seen this in both litcord and
// discordgo, with dgo claiming from his experiments.
// discordgo, with dgo claiming from experiments.
// RE: Those who want others to fix it for them: release the source code then.
const ExtraDelay = 250 * time.Millisecond
@ -161,7 +160,7 @@ func (l *Limiter) Release(path string, headers http.Header) error {
// seconds
remaining = headers.Get("X-RateLimit-Remaining")
reset = headers.Get("X-RateLimit-Reset")
reset = headers.Get("X-RateLimit-Reset") // float
retryAfter = headers.Get("Retry-After")
)
@ -169,10 +168,10 @@ func (l *Limiter) Release(path string, headers http.Header) error {
case retryAfter != "":
i, err := strconv.Atoi(retryAfter)
if err != nil {
return errors.Wrap(err, "invalid retryAfter "+retryAfter)
return errors.Wrapf(err, "invalid retryAfter %q", retryAfter)
}
at := time.Now().Add(time.Duration(i) * time.Millisecond)
at := time.Now().Add(time.Duration(i) * time.Second)
if global != "" { // probably true
atomic.StoreInt64(l.global, at.UnixNano())
@ -186,8 +185,10 @@ func (l *Limiter) Release(path string, headers http.Header) error {
return errors.Wrap(err, "invalid reset "+reset)
}
b.reset = time.Unix(0, int64(unix*float64(time.Second))).
Add(ExtraDelay)
sec := int64(unix)
nsec := int64((unix - float64(sec)) * float64(time.Second))
b.reset = time.Unix(sec, nsec).Add(ExtraDelay)
}
if remaining != "" {