Salastil/nitter
1
0
Fork 0
mirror of https://github.com/zedeus/nitter.git synced 2025-12-06 03:55:36 -05:00
Code Activity

Use dynamic rate limits from API responses

Browse Source
This commit is contained in:
Zed
2025-11-16 05:22:45 +01:00
parent 6fe850b2c6
commit 4fc7b873c4
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/apiutils.nim
View File

@@ -7,6 +7,7 @@ import experimental/types/common
const const
rlRemaining = "x-rate-limit-remaining" rlRemaining = "x-rate-limit-remaining"
rlReset = "x-rate-limit-reset" rlReset = "x-rate-limit-reset"
rlLimit = "x-rate-limit-limit"
errorsToSkip = {doesntExist, tweetNotFound, timeout, unauthorized, badRequest} errorsToSkip = {doesntExist, tweetNotFound, timeout, unauthorized, badRequest}
var pool: HttpPool var pool: HttpPool
@@ -83,7 +84,8 @@ template fetchImpl(result, fetchBody) {.dirty.} =
let let
remaining = parseInt(resp.headers[rlRemaining]) remaining = parseInt(resp.headers[rlRemaining])
reset = parseInt(resp.headers[rlReset]) reset = parseInt(resp.headers[rlReset])
session.setRateLimit(api, remaining, reset) limit = parseInt(resp.headers[rlLimit])
session.setRateLimit(api, remaining, reset, limit)
if result.len > 0: if result.len > 0:
if resp.headers.getOrDefault("content-encoding") == "gzip": if resp.headers.getOrDefault("content-encoding") == "gzip":

13
src/auth.nim
View File

@@ -57,7 +57,8 @@ proc getSessionPoolHealth*(): JsonNode =
for api in session.apis.keys: for api in session.apis.keys:
let let
apiStatus = session.apis[api] apiStatus = session.apis[api]
reqs = apiMaxReqs[api] - apiStatus.remaining limit = if apiStatus.limit > 0: apiStatus.limit else: apiMaxReqs.getOrDefault(api, 0)
reqs = limit - apiStatus.remaining
# no requests made with this session and endpoint since the limit reset # no requests made with this session and endpoint since the limit reset
if apiStatus.reset < now: if apiStatus.reset < now:
@@ -172,17 +173,17 @@ proc setLimited*(session: Session; api: Api) =
session.limitedAt = epochTime().int session.limitedAt = epochTime().int
log "rate limited by api: ", api, ", reqs left: ", session.apis[api].remaining, ", id: ", session.id log "rate limited by api: ", api, ", reqs left: ", session.apis[api].remaining, ", id: ", session.id
proc setRateLimit*(session: Session; api: Api; remaining, reset: int) = proc setRateLimit*(session: Session; api: Api; remaining, reset, limit: int) =
# avoid undefined behavior in race conditions # avoid undefined behavior in race conditions
if api in session.apis: if api in session.apis:
let limit = session.apis[api] let rateLimit = session.apis[api]
if limit.reset >= reset and limit.remaining < remaining: if rateLimit.reset >= reset and rateLimit.remaining < remaining:
return return
if limit.reset == reset and limit.remaining >= remaining: if rateLimit.reset == reset and rateLimit.remaining >= remaining:
session.apis[api].remaining = remaining session.apis[api].remaining = remaining
return return
session.apis[api] = RateLimit(remaining: remaining, reset: reset) session.apis[api] = RateLimit(limit: limit, remaining: remaining, reset: reset)
proc initSessionPool*(cfg: Config; path: string) = proc initSessionPool*(cfg: Config; path: string) =
enableLogging = cfg.enableDebug enableLogging = cfg.enableDebug

1
src/types.nim
View File

@@ -28,6 +28,7 @@ type
userMedia userMedia
RateLimit* = object RateLimit* = object
limit*: int
remaining*: int remaining*: int
reset*: int reset*: int