Skip to content

Commit

Permalink
feat(retryWhen): add higher-order lettable version of retryWhen
Browse files Browse the repository at this point in the history
  • Loading branch information
jasonaden committed Sep 6, 2017
1 parent 28e9b13 commit 1290e3c
Show file tree
Hide file tree
Showing 3 changed files with 121 additions and 99 deletions.
101 changes: 2 additions & 99 deletions src/operator/retryWhen.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,5 @@
import { Operator } from '../Operator';
import { Subscriber } from '../Subscriber';
import { Observable } from '../Observable';
import { Subject } from '../Subject';
import { Subscription, TeardownLogic } from '../Subscription';
import { tryCatch } from '../util/tryCatch';
import { errorObject } from '../util/errorObject';

import { OuterSubscriber } from '../OuterSubscriber';
import { InnerSubscriber } from '../InnerSubscriber';
import { subscribeToResult } from '../util/subscribeToResult';

import { retryWhen as higherOrder } from '../operators/retryWhen';
/**
* Returns an Observable that mirrors the source Observable with the exception of an `error`. If the source Observable
* calls `error`, this method will emit the Throwable that caused the error to the Observable returned from `notifier`.
Expand All @@ -25,92 +15,5 @@ import { subscribeToResult } from '../util/subscribeToResult';
* @owner Observable
*/
export function retryWhen<T>(this: Observable<T>, notifier: (errors: Observable<any>) => Observable<any>): Observable<T> {
return this.lift(new RetryWhenOperator(notifier, this));
}

class RetryWhenOperator<T> implements Operator<T, T> {
constructor(protected notifier: (errors: Observable<any>) => Observable<any>,
protected source: Observable<T>) {
}

call(subscriber: Subscriber<T>, source: any): TeardownLogic {
return source.subscribe(new RetryWhenSubscriber(subscriber, this.notifier, this.source));
}
}

/**
* We need this JSDoc comment for affecting ESDoc.
* @ignore
* @extends {Ignored}
*/
class RetryWhenSubscriber<T, R> extends OuterSubscriber<T, R> {

private errors: Subject<any>;
private retries: Observable<any>;
private retriesSubscription: Subscription;

constructor(destination: Subscriber<R>,
private notifier: (errors: Observable<any>) => Observable<any>,
private source: Observable<T>) {
super(destination);
}

error(err: any) {
if (!this.isStopped) {

let errors = this.errors;
let retries: any = this.retries;
let retriesSubscription = this.retriesSubscription;

if (!retries) {
errors = new Subject();
retries = tryCatch(this.notifier)(errors);
if (retries === errorObject) {
return super.error(errorObject.e);
}
retriesSubscription = subscribeToResult(this, retries);
} else {
this.errors = null;
this.retriesSubscription = null;
}

this._unsubscribeAndRecycle();

this.errors = errors;
this.retries = retries;
this.retriesSubscription = retriesSubscription;

errors.next(err);
}
}

protected _unsubscribe() {
const { errors, retriesSubscription } = this;
if (errors) {
errors.unsubscribe();
this.errors = null;
}
if (retriesSubscription) {
retriesSubscription.unsubscribe();
this.retriesSubscription = null;
}
this.retries = null;
}

notifyNext(outerValue: T, innerValue: R,
outerIndex: number, innerIndex: number,
innerSub: InnerSubscriber<T, R>): void {
const { errors, retries, retriesSubscription } = this;
this.errors = null;
this.retries = null;
this.retriesSubscription = null;

this._unsubscribeAndRecycle();

this.errors = errors;
this.retries = retries;
this.retriesSubscription = retriesSubscription;

this.source.subscribe(this);
}
return higherOrder(notifier)(this);
}
1 change: 1 addition & 0 deletions src/operators/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ export { reduce } from './reduce';
export { repeat } from './repeat';
export { repeatWhen } from './repeatWhen';
export { retry } from './retry';
export { retryWhen } from './retryWhen';
export { refCount } from './refCount';
export { scan } from './scan';
export { subscribeOn } from './subscribeOn';
Expand Down
118 changes: 118 additions & 0 deletions src/operators/retryWhen.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
import { Operator } from '../Operator';
import { Subscriber } from '../Subscriber';
import { Observable } from '../Observable';
import { Subject } from '../Subject';
import { Subscription, TeardownLogic } from '../Subscription';
import { tryCatch } from '../util/tryCatch';
import { errorObject } from '../util/errorObject';

import { OuterSubscriber } from '../OuterSubscriber';
import { InnerSubscriber } from '../InnerSubscriber';
import { subscribeToResult } from '../util/subscribeToResult';

import { MonoTypeOperatorFunction } from '../interfaces';

/**
* Returns an Observable that mirrors the source Observable with the exception of an `error`. If the source Observable
* calls `error`, this method will emit the Throwable that caused the error to the Observable returned from `notifier`.
* If that Observable calls `complete` or `error` then this method will call `complete` or `error` on the child
* subscription. Otherwise this method will resubscribe to the source Observable.
*
* <img src="./img/retryWhen.png" width="100%">
*
* @param {function(errors: Observable): Observable} notifier - Receives an Observable of notifications with which a
* user can `complete` or `error`, aborting the retry.
* @return {Observable} The source Observable modified with retry logic.
* @method retryWhen
* @owner Observable
*/
export function retryWhen<T>(notifier: (errors: Observable<any>) => Observable<any>): MonoTypeOperatorFunction<T> {
return (source: Observable<T>) => source.lift(new RetryWhenOperator(notifier, source));
}

class RetryWhenOperator<T> implements Operator<T, T> {
constructor(protected notifier: (errors: Observable<any>) => Observable<any>,
protected source: Observable<T>) {
}

call(subscriber: Subscriber<T>, source: any): TeardownLogic {
return source.subscribe(new RetryWhenSubscriber(subscriber, this.notifier, this.source));
}
}

/**
* We need this JSDoc comment for affecting ESDoc.
* @ignore
* @extends {Ignored}
*/
class RetryWhenSubscriber<T, R> extends OuterSubscriber<T, R> {

private errors: Subject<any>;
private retries: Observable<any>;
private retriesSubscription: Subscription;

constructor(destination: Subscriber<R>,
private notifier: (errors: Observable<any>) => Observable<any>,
private source: Observable<T>) {
super(destination);
}

error(err: any) {
if (!this.isStopped) {

let errors = this.errors;
let retries: any = this.retries;
let retriesSubscription = this.retriesSubscription;

if (!retries) {
errors = new Subject();
retries = tryCatch(this.notifier)(errors);
if (retries === errorObject) {
return super.error(errorObject.e);
}
retriesSubscription = subscribeToResult(this, retries);
} else {
this.errors = null;
this.retriesSubscription = null;
}

this._unsubscribeAndRecycle();

this.errors = errors;
this.retries = retries;
this.retriesSubscription = retriesSubscription;

errors.next(err);
}
}

protected _unsubscribe() {
const { errors, retriesSubscription } = this;
if (errors) {
errors.unsubscribe();
this.errors = null;
}
if (retriesSubscription) {
retriesSubscription.unsubscribe();
this.retriesSubscription = null;
}
this.retries = null;
}

notifyNext(outerValue: T, innerValue: R,
outerIndex: number, innerIndex: number,
innerSub: InnerSubscriber<T, R>): void {
const { errors, retries, retriesSubscription } = this;
this.errors = null;
this.retries = null;
this.retriesSubscription = null;

this._unsubscribeAndRecycle();

this.errors = errors;
this.retries = retries;
this.retriesSubscription = retriesSubscription;

this.source.subscribe(this);
}
}

0 comments on commit 1290e3c

Please sign in to comment.