mirror of
https://github.com/lilydjwg/nvchecker
synced 2025-02-26 07:21:25 +00:00
update github source to handle rate limits according to current github docs
This commit is contained in:
parent
60d88ac5d2
commit
6b73d8cd87
@ -1,18 +1,21 @@
|
|||||||
# MIT licensed
|
# MIT licensed
|
||||||
# Copyright (c) 2013-2020 lilydjwg <lilydjwg@gmail.com>, et al.
|
# Copyright (c) 2013-2020, 2024 lilydjwg <lilydjwg@gmail.com>, et al.
|
||||||
|
|
||||||
import time
|
import time
|
||||||
from urllib.parse import urlencode
|
from urllib.parse import urlencode
|
||||||
from typing import List, Tuple, Union
|
from typing import List, Tuple, Union, Optional
|
||||||
|
import asyncio
|
||||||
|
|
||||||
import structlog
|
import structlog
|
||||||
|
|
||||||
from nvchecker.api import (
|
from nvchecker.api import (
|
||||||
VersionResult, Entry, AsyncCache, KeyManager,
|
VersionResult, Entry, AsyncCache, KeyManager,
|
||||||
TemporaryError, session, RichResult, GetVersionError,
|
HTTPError, session, RichResult, GetVersionError,
|
||||||
)
|
)
|
||||||
|
|
||||||
logger = structlog.get_logger(logger_name=__name__)
|
logger = structlog.get_logger(logger_name=__name__)
|
||||||
|
ALLOW_REQUEST = None
|
||||||
|
RATE_LIMITED_ERROR = False
|
||||||
|
|
||||||
GITHUB_URL = 'https://api.github.com/repos/%s/commits'
|
GITHUB_URL = 'https://api.github.com/repos/%s/commits'
|
||||||
GITHUB_LATEST_RELEASE = 'https://api.github.com/repos/%s/releases/latest'
|
GITHUB_LATEST_RELEASE = 'https://api.github.com/repos/%s/releases/latest'
|
||||||
@ -21,10 +24,28 @@ GITHUB_MAX_TAG = 'https://api.github.com/repos/%s/git/refs/tags'
|
|||||||
GITHUB_GRAPHQL_URL = 'https://api.github.com/graphql'
|
GITHUB_GRAPHQL_URL = 'https://api.github.com/graphql'
|
||||||
|
|
||||||
async def get_version(name, conf, **kwargs):
|
async def get_version(name, conf, **kwargs):
|
||||||
|
global RATE_LIMITED_ERROR, ALLOW_REQUEST
|
||||||
|
|
||||||
|
if RATE_LIMITED_ERROR:
|
||||||
|
raise RuntimeError('rate limited')
|
||||||
|
|
||||||
|
if ALLOW_REQUEST is None:
|
||||||
|
ALLOW_REQUEST = asyncio.Event()
|
||||||
|
ALLOW_REQUEST.set()
|
||||||
|
|
||||||
|
for _ in range(2): # retry once
|
||||||
try:
|
try:
|
||||||
|
await ALLOW_REQUEST.wait()
|
||||||
return await get_version_real(name, conf, **kwargs)
|
return await get_version_real(name, conf, **kwargs)
|
||||||
except TemporaryError as e:
|
except HTTPError as e:
|
||||||
check_ratelimit(e, name)
|
if e.code in [403, 429]:
|
||||||
|
if n := check_ratelimit(e, name):
|
||||||
|
ALLOW_REQUEST.clear()
|
||||||
|
await asyncio.sleep(n+1)
|
||||||
|
ALLOW_REQUEST.set()
|
||||||
|
continue
|
||||||
|
RATE_LIMITED_ERROR = True
|
||||||
|
raise
|
||||||
|
|
||||||
QUERY_LATEST_TAG = '''
|
QUERY_LATEST_TAG = '''
|
||||||
{{
|
{{
|
||||||
@ -193,10 +214,15 @@ async def get_version_real(
|
|||||||
url = data[0]['html_url'],
|
url = data[0]['html_url'],
|
||||||
)
|
)
|
||||||
|
|
||||||
def check_ratelimit(exc, name):
|
def check_ratelimit(exc: HTTPError, name: str) -> Optional[int]:
|
||||||
res = exc.response
|
res = exc.response
|
||||||
if not res:
|
if not res:
|
||||||
raise
|
raise exc
|
||||||
|
|
||||||
|
if v := res.headers.get('retry-after'):
|
||||||
|
n = int(v)
|
||||||
|
logger.warning('retry-after', n=n)
|
||||||
|
return n
|
||||||
|
|
||||||
# default -1 is used to re-raise the exception
|
# default -1 is used to re-raise the exception
|
||||||
n = int(res.headers.get('X-RateLimit-Remaining', -1))
|
n = int(res.headers.get('X-RateLimit-Remaining', -1))
|
||||||
@ -206,5 +232,6 @@ def check_ratelimit(exc, name):
|
|||||||
'Or get an API token to increase the allowance if not yet',
|
'Or get an API token to increase the allowance if not yet',
|
||||||
name = name,
|
name = name,
|
||||||
reset = reset)
|
reset = reset)
|
||||||
else:
|
return None
|
||||||
raise
|
|
||||||
|
raise exc
|
||||||
|
Loading…
Reference in New Issue
Block a user