@wandzai/utils 1.0.73-5162-3 → 1.0.73-5162-4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/http.js +18 -5
- package/src/http.js.map +1 -1
package/package.json
CHANGED
package/src/http.js
CHANGED
|
@@ -45,6 +45,17 @@ function buildQueryString(params) {
|
|
|
45
45
|
});
|
|
46
46
|
return queryParams.toString();
|
|
47
47
|
}
|
|
48
|
+
function getErrorDetails(error) {
|
|
49
|
+
if (error?.code) {
|
|
50
|
+
return `${error.code}: ${error.message || 'No further details'}`;
|
|
51
|
+
}
|
|
52
|
+
if (Array.isArray(error?.errors)) {
|
|
53
|
+
const innerErrors = error.errors.map((e) => getErrorDetails(e)).join('; ');
|
|
54
|
+
const errorName = error.name || 'AggregateError';
|
|
55
|
+
return `${errorName}: [${innerErrors}]`;
|
|
56
|
+
}
|
|
57
|
+
return error?.message || String(error);
|
|
58
|
+
}
|
|
48
59
|
async function retryWithBackoff(fn, logger, options = {
|
|
49
60
|
retries: 3,
|
|
50
61
|
baseDelayMs: 500,
|
|
@@ -57,18 +68,20 @@ async function retryWithBackoff(fn, logger, options = {
|
|
|
57
68
|
}
|
|
58
69
|
catch (error) {
|
|
59
70
|
const status = error?.response?.status;
|
|
60
|
-
const
|
|
71
|
+
const RETRIABLE_STATUS_CODES = [502, 503, 504];
|
|
72
|
+
const isRetriableError = !status || RETRIABLE_STATUS_CODES.includes(status);
|
|
61
73
|
const isLastAttempt = attempt === retries;
|
|
62
|
-
|
|
74
|
+
const errorDetails = getErrorDetails(error);
|
|
75
|
+
if (!isRetriableError || isLastAttempt) {
|
|
63
76
|
if (isLastAttempt) {
|
|
64
|
-
logger.error(`All ${retries} retries failed: ${
|
|
77
|
+
logger.error(`All ${retries} retries failed: ${errorDetails}`);
|
|
65
78
|
}
|
|
66
79
|
else {
|
|
67
|
-
logger.error(`Non-retriable error (HTTP ${status}): ${
|
|
80
|
+
logger.error(`Non-retriable error (HTTP ${status}): ${errorDetails}`);
|
|
68
81
|
}
|
|
69
82
|
throw error;
|
|
70
83
|
}
|
|
71
|
-
logger.warn(`Retry #${attempt} failed
|
|
84
|
+
logger.warn(`Retry #${attempt} failed: ${errorDetails}`);
|
|
72
85
|
const delayMs = baseDelayMs * 2 ** (attempt - 1);
|
|
73
86
|
await new Promise((res) => setTimeout(res, delayMs));
|
|
74
87
|
}
|
package/src/http.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../../../libs/utils/src/http.ts"],"names":[],"mappings":";;AAQA,oDAIC;AAED,gDAIC;AAQD,sDAkBC;AAQD,4CAYC;
|
|
1
|
+
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../../../libs/utils/src/http.ts"],"names":[],"mappings":"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"}
|