Fix onFailedAttempt and shouldRetry options being undefined (#82)

omril1 · web-flow · commit b400af6f1075 · 2024-11-15T12:46:31.000+07:00
diff --git a/index.js b/index.js
@@ -29,12 +29,10 @@ const decorateErrorWithCounts = (error, attemptNumber, options) => {
 
 export default async function pRetry(input, options) {
 	return new Promise((resolve, reject) => {
-		options = {
-			onFailedAttempt() {},
-			retries: 10,
-			shouldRetry: () => true,
-			...options,
-		};
+		options = {...options};
+		options.onFailedAttempt ??= () => {};
+		options.shouldRetry ??= () => true;
+		options.retries ??= 10;
 
 		const operation = retry.operation(options);
 
diff --git a/test.js b/test.js
@@ -222,6 +222,32 @@ test('onFailedAttempt can throw, causing all retries to be aborted', async t =>
 	}
 });
 
+test('onFailedAttempt can be undefined', async t => {
+	const error = new Error('thrown from onFailedAttempt');
+
+	await t.throwsAsync(pRetry(() => {
+		throw error;
+	}, {
+		onFailedAttempt: undefined,
+		retries: 1,
+	}), {
+		is: error,
+	});
+});
+
+test('shouldRetry can be undefined', async t => {
+	const error = new Error('thrown from onFailedAttempt');
+
+	await t.throwsAsync(pRetry(() => {
+		throw error;
+	}, {
+		shouldRetry: undefined,
+		retries: 1,
+	}), {
+		is: error,
+	});
+});
+
 test('throws useful error message when non-error is thrown', async t => {
 	await t.throwsAsync(pRetry(() => {
 		throw 'foo'; // eslint-disable-line no-throw-literal
