Skip to content

Commit c56babb

Browse files
fix(fetch): cleanup
1 parent 025ea93 commit c56babb

File tree

3 files changed

+6
-8
lines changed

3 files changed

+6
-8
lines changed

packages/operators/src/fetch/autoPagination.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export const autoPagination = ({ resolveRoute }) => {
99
return from(resolveRoute(url)).pipe(
1010
download(),
1111
expand(resp => {
12-
return from(resolveRoute(url, resp.clone())).pipe(
12+
return from(resolveRoute(url, resp)).pipe(
1313
filter(url => !!url),
1414
download()
1515
);

packages/operators/src/fetch/lazyPagination.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ describe('lazy pagination operator', function () {
3939

4040
pager.next({ value: 2 });
4141
pager.next({ value: 3 });
42-
pager.next({ value: 4 });
42+
pager.next({ value: 12 });
4343
pager.next({ value: 5 });
4444
pager.next({ value: 6 });
4545
pager.next({ value: 7 });

packages/operators/src/fetch/retry.js

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,13 @@ export const networkRetry = ({ timeout = defaultTimeout, count } = {}) => {
3030
count,
3131
delay: () => {
3232
return combineLatest([connectionObservable]).pipe(
33+
// all defined observables have to be valid
3334
map(values => values.every(v => v === true)),
35+
// reset counter if one observable is invalid
3436
tap(valid => (counter = counter * valid)),
37+
// continue only if all observables are valid
3538
filter(valid => valid),
36-
tap(() => {
37-
console.log(timeout(counter));
38-
console.log(
39-
`retry: request - next: ${counter + 1} in ${timeout(counter + 1) || timeout}s`
40-
);
41-
}),
39+
tap(() => console.log(`retry: request - next: ${counter} in ${timeout(counter)}s`)),
4240
delay(timeout(counter++) || timeout)
4341
);
4442
}

0 commit comments

Comments
 (0)