ofsc-utility 1.0.45 → 1.0.46

package/dist/utilities/index.js

@@ -69,40 +69,56 @@ const fetchWithRetry = async (url, clientId, clientSecret, instanceUrl, token, r
         });
     };
     console.log(`Fetching ${url}`);
-    // Try with the current token
-    let res = await doFetch(token);
-    /* ---------- 401: refresh token ONCE per call ---------- */
-    if (res.status === 401) {
-        console.warn("Token expired — renewing token…");
-        token = await (0, oauthTokenService_1.getOAuthToken)(clientId, clientSecret, instanceUrl);
-        res = await doFetch(token);
-    }
-    const responseText = await res.text();
-    const isNoRouteToHost = res.status === 400 &&
-        responseText.includes("NoRouteToHostException");
-    const isRetryableStatus = res.status === 429 ||
-        res.status === 502 ||
-        res.status === 503 ||
-        res.status === 504;
-    /* ---------- retry with backoff ---------- */
-    if ((isRetryableStatus || isNoRouteToHost) && retries > 0) {
-        const retryAfter = res.headers.get("Retry-After");
-        console.log("Retrying...", retryAfter);
-        const delay = retryAfter ? Number(retryAfter) * 1000 : baseDelay;
-        console.warn(`Retrying in ${delay}ms... (${retries} left)`);
-        await new Promise(r => setTimeout(r, delay));
-        return (0, exports.fetchWithRetry)(url, clientId, clientSecret, instanceUrl, token, retries - 1, baseDelay * 2);
-    }
-    // If still not OK → fail
-    if (!res.ok) {
-        const body = await res.text();
-        throw new Error(`Request failed: ${res.status} ${res.statusText}\n${body}`);
+    let currentToken = token;
+    let tokenRefreshed = false;
+    let remainingRetries = retries;
+    let delay = baseDelay;
+    while (true) {
+        let res = await doFetch(currentToken);
+        if (res.status === 401 && !tokenRefreshed) {
+            console.warn("Token expired — renewing token…");
+            currentToken = await (0, oauthTokenService_1.getOAuthToken)(clientId, clientSecret, instanceUrl);
+            tokenRefreshed = true;
+            continue;
+        }
+        const responseText = await res.text();
+        const isNoRouteToHost = res.status === 400 &&
+            responseText.includes("NoRouteToHostException");
+        const isRetryableStatus = res.status === 429 ||
+            res.status === 502 ||
+            res.status === 503 ||
+            res.status === 504;
+        if ((isRetryableStatus || isNoRouteToHost) &&
+            remainingRetries > 0) {
+            const retryAfter = res.headers.get("Retry-After");
+            let retryDelay = delay;
+            if (retryAfter) {
+                const retryAfterSeconds = Number(retryAfter);
+                if (!Number.isNaN(retryAfterSeconds)) {
+                    retryDelay = retryAfterSeconds * 1000;
+                }
+            }
+            console.warn(`Retrying in ${retryDelay}ms... (${remainingRetries} retries left)`);
+            await new Promise(resolve => setTimeout(resolve, retryDelay));
+            remainingRetries--;
+            delay *= 2;
+            continue;
+        }
+        if (!res.ok) {
+            throw new Error(`Request failed: ${res.status} ${res.statusText}\n${responseText}`);
+        }
+        let data;
+        try {
+            data = JSON.parse(responseText);
+        }
+        catch {
+            throw new Error(`Invalid JSON response from ${url}\n${responseText}`);
+        }
+        return {
+            data,
+            token: currentToken
+        };
     }
-    // Return parsed JSON + latest token
-    return {
-        data: await res.json(),
-        token
-    };
 };
 exports.fetchWithRetry = fetchWithRetry;
 const fs_1 = __importDefault(require("fs"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ofsc-utility",
-  "version": "1.0.45",
+  "version": "1.0.46",
   "description": "TypeScript helpers for Oracle Field Service Cloud (OFSC): events, resources, inventories, metadata and CSV/Excel utilities.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",