Merge pull request #87 from basics/feature/cleanup

fix(operators): retry cleanup

Author: StephanGerbeth

packages/operators/src/request/request.js

@@ -1,10 +1,10 @@
 import { concatMap, from, throwError } from 'rxjs';
 
-import { cache as caching } from './cache';
+import { cache } from './cache';
 import { resolveBlob, resolveJSON, resolveText } from './response';
-import { networkRetry } from './retry';
+import { retryWhenError } from './retry';
 
-export const request = ({ retry, cache } = {}) => {
+export const request = ({ retry, cache: cacheOptions } = {}) => {
   return source =>
     source.pipe(
       concatMap(req => {
@@ -14,8 +14,8 @@ export const request = ({ retry, cache } = {}) => {
           return throwError(() => new Error('Failed to fetch: resource not valid'));
         }
       }),
-      networkRetry(retry),
-      caching(cache)
+      retryWhenError(retry),
+      cache(cacheOptions)
     );
 };
 

packages/operators/src/request/retry.js

@@ -16,7 +16,7 @@ import { connectionObservable } from '../../../observables/src/dom/window.js';
 
 const defaultTimeout = count => Math.min(60000, Math.pow(count, 2) * 1000);
 
-export const networkRetry = ({ timeout = defaultTimeout, count } = {}) => {
+export const retryWhenError = ({ timeout = defaultTimeout, count } = {}) => {
   let counter = 0;
 
   return source => {

packages/operators/src/request/retry.test.js

@@ -3,7 +3,7 @@ import { TestScheduler } from 'rxjs/testing';
 import { beforeEach, describe, expect, test } from 'vitest';
 
 import { log } from '../log';
-import { networkRetry } from './retry';
+import { retryWhenError } from './retry';
 
 describe('request retry', () => {
   let testScheduler;
@@ -26,7 +26,7 @@ describe('request retry', () => {
       // if you define a delay, you have to add the delay to the subscribe multiple times (num retries)
       const stream = cold('a|', { a: () => triggerVal.shift() }).pipe(
         map(fn => fn()),
-        networkRetry({ timeout: () => 5 }),
+        retryWhenError({ timeout: () => 5 }),
         log('marble:result')
       );