aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Klebanoff <steve.klebanoff@gmail.com>2018-11-09 08:54:45 +0800
committerSteve Klebanoff <steve.klebanoff@gmail.com>2018-11-09 08:54:45 +0800
commite45b6c7e98a33de0e13f4ab7db8b630900dbb960 (patch)
tree12ca1aeb83063015b3124c6025af99abd3d3d5ea
parentdd4d3b10cf8c0bb08f981128232d3663d01806eb (diff)
downloaddexon-sol-tools-e45b6c7e98a33de0e13f4ab7db8b630900dbb960.tar
dexon-sol-tools-e45b6c7e98a33de0e13f4ab7db8b630900dbb960.tar.gz
dexon-sol-tools-e45b6c7e98a33de0e13f4ab7db8b630900dbb960.tar.bz2
dexon-sol-tools-e45b6c7e98a33de0e13f4ab7db8b630900dbb960.tar.lz
dexon-sol-tools-e45b6c7e98a33de0e13f4ab7db8b630900dbb960.tar.xz
dexon-sol-tools-e45b6c7e98a33de0e13f4ab7db8b630900dbb960.tar.zst
dexon-sol-tools-e45b6c7e98a33de0e13f4ab7db8b630900dbb960.zip
Make heartbeat more generic
-rw-r--r--packages/instant/src/components/zero_ex_instant_provider.tsx9
-rw-r--r--packages/instant/src/util/hearbeats.ts43
2 files changed, 29 insertions, 23 deletions
diff --git a/packages/instant/src/components/zero_ex_instant_provider.tsx b/packages/instant/src/components/zero_ex_instant_provider.tsx
index 02f14c5b6..1805a11af 100644
--- a/packages/instant/src/components/zero_ex_instant_provider.tsx
+++ b/packages/instant/src/components/zero_ex_instant_provider.tsx
@@ -15,7 +15,7 @@ import { AffiliateInfo, AssetMetaData, Network, OrderSource } from '../types';
import { assetUtils } from '../util/asset';
import { errorFlasher } from '../util/error_flasher';
import { gasPriceEstimator } from '../util/gas_price_estimator';
-import { AccountUpdateHeartbeat } from '../util/hearbeats';
+import { generateAccountHeartbeater, Heartbeater } from '../util/hearbeats';
import { providerStateFactory } from '../util/provider_state_factory';
fonts.include();
@@ -39,7 +39,7 @@ export interface ZeroExInstantProviderOptionalProps {
export class ZeroExInstantProvider extends React.Component<ZeroExInstantProviderProps> {
private readonly _store: Store;
- private _accountUpdateHeartbeat?: AccountUpdateHeartbeat;
+ private _accountUpdateHeartbeat?: Heartbeater;
// TODO(fragosti): Write tests for this beast once we inject a provider.
private static _mergeDefaultStateWithProps(
props: ZeroExInstantProviderProps,
@@ -97,8 +97,9 @@ export class ZeroExInstantProvider extends React.Component<ZeroExInstantProvider
}
// tslint:disable-next-line:no-floating-promises
// asyncData.fetchAccountInfoAndDispatchToStore(this._store);
- this._accountUpdateHeartbeat = new AccountUpdateHeartbeat();
- this._accountUpdateHeartbeat.start(this._store, ACCOUNT_UPDATE_INTERVAL_TIME_MS);
+
+ this._accountUpdateHeartbeat = generateAccountHeartbeater(this._store);
+ this._accountUpdateHeartbeat.start(ACCOUNT_UPDATE_INTERVAL_TIME_MS);
// warm up the gas price estimator cache just in case we can't
// grab the gas price estimate when submitting the transaction
diff --git a/packages/instant/src/util/hearbeats.ts b/packages/instant/src/util/hearbeats.ts
index 78ab86360..443fd13ec 100644
--- a/packages/instant/src/util/hearbeats.ts
+++ b/packages/instant/src/util/hearbeats.ts
@@ -1,48 +1,53 @@
+// TODO: rename file
+
import * as _ from 'lodash';
import { asyncData } from './../redux/async_data';
import { Store } from './../redux/store';
-export class AccountUpdateHeartbeat {
+type HeartbeatableFunction = () => Promise<void>;
+export class Heartbeater {
private _intervalId?: number;
- private _pendingRequest?: boolean;
- private _store?: Store;
+ private _pendingRequest: boolean;
+ private _performingFunctionAsync: HeartbeatableFunction;
+
+ public constructor(_performingFunctionAsync: HeartbeatableFunction) {
+ this._performingFunctionAsync = _performingFunctionAsync;
+ this._pendingRequest = false;
+ }
- public start(store: Store, intervalTimeMs: number): void {
+ public start(intervalTimeMs: number): void {
if (!_.isUndefined(this._intervalId)) {
throw new Error('Heartbeat is running, please stop before restarting');
}
- this._store = store;
- // Kick off initial first request
- // tslint:disable-next-line:no-floating-promises
- this._performActionAsync(true);
- // Set interval for heartbeat
- this._intervalId = window.setInterval(this._performActionAsync.bind(this, false), intervalTimeMs);
+ this._trackAndPerformAsync();
+ this._intervalId = window.setInterval(this._trackAndPerformAsync.bind(this), intervalTimeMs);
}
public stop(): void {
- if (!_.isUndefined(this._intervalId)) {
+ if (this._intervalId) {
window.clearInterval(this._intervalId);
- this._resetState();
}
- }
-
- private _resetState(): void {
this._intervalId = undefined;
this._pendingRequest = false;
- this._store = undefined;
}
- private async _performActionAsync(setLoading: boolean): Promise<void> {
- if (this._pendingRequest || _.isUndefined(this._store)) {
+ private async _trackAndPerformAsync(): Promise<void> {
+ if (this._pendingRequest) {
return;
}
this._pendingRequest = true;
try {
- await asyncData.fetchAccountInfoAndDispatchToStore(this._store, { setLoading });
+ this._performingFunctionAsync();
} finally {
this._pendingRequest = false;
}
}
}
+
+export const generateAccountHeartbeater = (store: Store): Heartbeater => {
+ return new Heartbeater(async () => {
+ await asyncData.fetchAccountInfoAndDispatchToStore(store, { setLoading: false });
+ });
+};