eric/WeatherStar4000
1
0
Fork 0
mirror of https://github.com/netbymatt/ws4kp.git synced 2026-04-14 15:49:31 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix retry count display in doFetch

Browse Source
This commit is contained in:
Eddy G
2025-07-12 12:25:02 -04:00
parent ee4f84689a
commit 4b34ffabcb
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/scripts/modules/utils/fetch.mjs
View File

@@ -181,9 +181,9 @@ const fetchAsync = async (_url, responseType, _params = {}) => {
};
// fetch with retry and back-off
const doFetch = (url, params) => new Promise((resolve, reject) => {
// Store the original retry count for logging purposes
const originalRetryCount = params.retryCount;
const doFetch = (url, params, originalRetryCount = null) => new Promise((resolve, reject) => {
// On the first call, store the retry count for later logging
const initialRetryCount = originalRetryCount ?? params.retryCount;
// Create AbortController for timeout
const controller = new AbortController();
@@ -206,11 +206,11 @@ const doFetch = (url, params) => new Promise((resolve, reject) => {
return reject(new Error('Invalid retry parameters'));
}
const retryAttempt = originalRetryCount - params.retryCount + 1;
const retryAttempt = initialRetryCount - params.retryCount + 1;
const remainingRetries = params.retryCount - 1;
const delayMs = retryDelay(retryAttempt);
console.warn(`🔄 Retry ${retryAttempt}/${originalRetryCount} for ${url} - ${reason} (retrying in ${delayMs}ms, ${remainingRetries} retr${remainingRetries === 1 ? 'y' : 'ies'} left)`);
console.warn(`🔄 Retry ${retryAttempt}/${initialRetryCount} for ${url} - ${reason} (retrying in ${delayMs}ms, ${remainingRetries} retr${remainingRetries === 1 ? 'y' : 'ies'} left)`);
// call the "still waiting" function on first retry
if (params && params.stillWaiting && typeof params.stillWaiting === 'function' && retryAttempt === 1) {
@@ -227,7 +227,7 @@ const doFetch = (url, params) => new Promise((resolve, reject) => {
};
// Use setTimeout directly instead of the delay wrapper to avoid Promise resolution issues
setTimeout(() => {
doFetch(url, newParams).then(resolve).catch(reject);
doFetch(url, newParams, initialRetryCount).then(resolve).catch(reject);
}, delayMs);
return undefined; // Explicit return for linter
};