diff options
| -rw-r--r-- | build/hypixelApi.js | 3 | ||||
| -rw-r--r-- | src/hypixelApi.ts | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/build/hypixelApi.js b/build/hypixelApi.js index 0656d62..e4ba7ff 100644 --- a/build/hypixelApi.js +++ b/build/hypixelApi.js @@ -52,8 +52,10 @@ async function sendApiRequest({ path, key, args }) { // Construct a url from the base api url, path, and arguments const fetchUrl = baseHypixelAPI + '/' + path + '?' + util_1.jsonToQuery(args); let fetchResponse; + let fetchJsonParsed; try { fetchResponse = await node_fetch_1.default(fetchUrl, { agent: () => httpsAgent }); + fetchJsonParsed = await fetchResponse.json(); } catch { // if there's an error, wait a second and try again @@ -67,7 +69,6 @@ async function sendApiRequest({ path, key, args }) { limit: fetchResponse.headers['ratelimit-limit'], reset: Date.now() + parseInt(fetchResponse.headers['ratelimit-reset']) * 1000 }; - const fetchJsonParsed = await fetchResponse.json(); if (fetchJsonParsed.throttle) { if (apiKeyUsage[key]) apiKeyUsage[key].remaining = 0; diff --git a/src/hypixelApi.ts b/src/hypixelApi.ts index f072d11..ee63155 100644 --- a/src/hypixelApi.ts +++ b/src/hypixelApi.ts @@ -137,12 +137,14 @@ export async function sendApiRequest({ path, key, args }): Promise<HypixelRespon const fetchUrl = baseHypixelAPI + '/' + path + '?' + jsonToQuery(args) let fetchResponse: nodeFetch.Response + let fetchJsonParsed: any try { fetchResponse = await fetch( fetchUrl, { agent: () => httpsAgent } ) + fetchJsonParsed = await fetchResponse.json() } catch { // if there's an error, wait a second and try again await new Promise((resolve) => setTimeout(resolve, 1000)) @@ -157,7 +159,6 @@ export async function sendApiRequest({ path, key, args }): Promise<HypixelRespon reset: Date.now() + parseInt(fetchResponse.headers['ratelimit-reset']) * 1000 } - const fetchJsonParsed = await fetchResponse.json() if (fetchJsonParsed.throttle) { if (apiKeyUsage[key]) apiKeyUsage[key].remaining = 0 |