fix(fix tryuntilasync): fixes tryUntilAsync issue where scalar was sk…

…ipping correct behavior
Marviel · Nov 7, 2023 · 6b0a563 · 6b0a563
1 parent 5750ea6
commit 6b0a563
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@lukebechtel/lab-ts-utils",
-    "version": "6.1.0",
+    "version": "6.1.1",
     "description": "A library of small, self-contained utility functions for use in TypeScript projects.",
     "main": "./lib/src/index.js",
     "types": "./lib/src/index.d.ts",

diff --git a/src/functions/tryUntilAsync.ts b/src/functions/tryUntilAsync.ts
@@ -354,12 +354,32 @@ export function tryUntilAsync<TReturn>(
                     })
                     // console.log('expBackoff done')
                     continue;
-                } else if (!delay.type && delay.ms) {
+                } else if (delay.type === 'old' || delay.type === undefined || delay.type === null) {
+                    if (delay.ms) {
+                        await new Promise(delayRes => {
+                            delayTimeout = setTimeout(delayRes, delay.ms);
+                        });
+                        continue;
+                    }
+                    else if (delay.delayFunction) {
+                        // console.log('custom start')
+                        await delay.delayFunction({
+                            numFailedAttempts: attempts,
+                            tryLimits,
+                            err: pastErrors.getLast(),
+                            pastErrors: pastErrors.toArray(),
+                        });
+                        // console.log('custom done')
+                        continue;
+                    }
+                }
+                else if (delay.type === 'scalar') {
                     await new Promise(delayRes => {
                         delayTimeout = setTimeout(delayRes, delay.ms);
                     });
                     continue;
-                } else if ((delay.type === undefined || delay.type === 'custom') && delay.delayFunction) {
+                }
+                else if (delay.type === 'custom') {
                     // console.log('custom start')
                     await delay.delayFunction({
                         numFailedAttempts: attempts,

diff --git a/test/tryUntil.spec.ts b/test/tryUntil.spec.ts
@@ -191,7 +191,7 @@ describe('tryUntilAsync', () => {
 
     test('scalar delay', async () => {
         let attempts = 0;
-        const res = await tryUntilAsync({
+        await expect(tryUntilAsync({
             func: async ({ numPreviousTries }) => {
                 attempts += 1;
                 if (numPreviousTries < 3) {
@@ -205,8 +205,11 @@ describe('tryUntilAsync', () => {
                 type: 'scalar',
                 ms: 1000,
             },
-        });
-        expect(attempts).toBe(4);
+            tryLimits: {
+                maxTimeMS: 1500,
+            }
+        })).rejects.toThrow();
+        expect(attempts).toBe(2);
     });
 
     test('expBackoff delay', async () => {