fix: retry error shouldn't distinguish if it's not a lyla error, all error is possible.

Author: 07akioni

packages/core/src/core.ts

@@ -7,8 +7,7 @@ import {
   LylaBrokenOnAfterResponseError,
   LylaBrokenOnResponseErrorError,
   LylaBrokenOnInitError,
-  LylaBrokenOnBeforeRequestError,
-  isLylaError
+  LylaBrokenOnBeforeRequestError
 } from './error'
 import { mergeUrl, mergeHeaders, mergeOptions } from './utils'
 import type {
@@ -160,7 +159,7 @@ export function createLyla<C, M extends LylaAdapterMeta>(
           error: e,
           response: undefined,
           context: optionsWithContext.context,
-          requestOptions: optionsWithContext,
+          requestOptions: optionsWithContext
         },
         undefined
       )
@@ -734,36 +733,32 @@ export function createLyla<C, M extends LylaAdapterMeta>(
         try {
           response = await request(finalOptions)
         } catch (e) {
-          // expected error
-          if (_isLylaError(e)) {
-            let rejected: LylaRetryOnRejectedCommand<C, M>
-            // onRejected throws an error
-            try {
-              rejected = await onRejected({
-                options: finalOptions as LylaRequestOptionsWithContext<C, M>,
-                state,
-                lyla,
-                error: e
-              })
-            } catch (e) {
-              throw makeBrokenRetryError(e)
-            }
-            // expected error
-            switch (rejected.action) {
-              case 'reject':
-                if (_isLylaError(rejected.value)) {
-                  throw rejected.value
-                } else {
-                  throw makeRetryRejectedError(rejected.value)
-                }
-              case 'retry':
-                retryOptionsResolver = rejected.value
-                continue
-            }
-          } else {
-            // If it goes here, this is a bug.
+          let rejected: LylaRetryOnRejectedCommand<C, M>
+          // onRejected throws an error
+          try {
+            rejected = await onRejected({
+              options: finalOptions as LylaRequestOptionsWithContext<C, M>,
+              state,
+              lyla,
+              // The error can be a lyla error, or a custom error thrown by user
+              // in lyla hooks.
+              error: e
+            })
+          } catch (e) {
             throw makeBrokenRetryError(e)
           }
+          // expected error
+          switch (rejected.action) {
+            case 'reject':
+              if (_isLylaError(rejected.value)) {
+                throw rejected.value
+              } else {
+                throw makeRetryRejectedError(rejected.value)
+              }
+            case 'retry':
+              retryOptionsResolver = rejected.value
+              continue
+          }
         }
 
         let resolved: LylaRetryOnResolvedCommand<any, C, M>

packages/core/src/types.ts

@@ -266,7 +266,7 @@ export type LylaWithRetryOptions<C, M extends LylaAdapterMeta, S> = {
     state: S
     options: LylaRequestOptionsWithContext<C, M>
     lyla: Lyla<C, M>
-    error: LylaError<C, M>
+    error: unknown
   }) => Promise<LylaRetryOnRejectedCommand<C, M>>
   createState: () => S
 }