Skip to content
This repository has been archived by the owner on Dec 9, 2021. It is now read-only.

add requestingInterceptorMiddleware #22

Open
wants to merge 3 commits into
base: TypeScript
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 39 additions & 0 deletions src/middlewares/requestingInterceptorMiddleware.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
import { Dispatch, Middleware, MiddlewareAPI } from 'redux';
import IStore from '../models/IStore';
import IAction from '../models/IAction';
import { delay } from '../utilities/delay';

const actionTypeTimeStampMap: Map<string, number> = new Map();

const requestingInterceptorMiddleware: Middleware = (store: MiddlewareAPI<Dispatch, IStore>) => (next: Dispatch) => async (
action: IAction<any>
): Promise<void> => {
const isRequestType: boolean = action.type.includes('REQUEST_');
const isFinishedRequestType: boolean = action.type.includes('_FINISHED');
const isStartRequestType: boolean = action.type.includes('REQUEST_') && !isFinishedRequestType;

if (isStartRequestType) {
actionTypeTimeStampMap.set(action.type, new Date().getTime());
codeBelt marked this conversation as resolved.
Show resolved Hide resolved
}

if (!action.error && isRequestType && isFinishedRequestType) {
const minimumDelay: number = 500;
const startRequestType: string = action.type.replace('_FINISHED', '');
const dateTimeStarted: number = actionTypeTimeStampMap.get(startRequestType) ?? new Date().getTime();

actionTypeTimeStampMap.delete(startRequestType);

const dateTimeNow: number = new Date().getTime();
const latency: number = dateTimeNow - dateTimeStarted;
const remainder: number = minimumDelay - latency;
const shouldDelayResponse: boolean = latency < minimumDelay;

if (shouldDelayResponse) {
await delay(remainder);
}
}

next(action);
};

export default requestingInterceptorMiddleware;
11 changes: 8 additions & 3 deletions src/stores/rootStore.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,16 @@ import environment from 'environment';
import rootReducer from './rootReducer';
import IStore from '../models/IStore';
import errorToastMiddleware from '../middlewares/errorToastMiddleware';
import requestingInterceptorMiddleware from '../middlewares/requestingInterceptorMiddleware';

export default (initialState: Partial<IStore>, history: History): Store<IStore> => {
const middleware: Middleware[] = [environment.isDevelopment ? reduxFreeze : null!, thunk, routerMiddleware(history), errorToastMiddleware()].filter(
Boolean
);
const middleware: Middleware[] = [
environment.isDevelopment ? reduxFreeze : null!,
thunk,
routerMiddleware(history),
requestingInterceptorMiddleware,
errorToastMiddleware(),
].filter(Boolean);

const store: Store<IStore> = createStore(rootReducer(history), initialState, composeWithDevTools(applyMiddleware(...middleware)));

Expand Down
15 changes: 1 addition & 14 deletions src/utilities/HttpUtility.ts
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ export default class HttpUtility {
...config?.headers,
},
};
const [axiosResponse] = await Promise.all([axios(axiosRequestConfig), HttpUtility._delay()]);
const axiosResponse = await axios(axiosRequestConfig);

const { status, data, request } = axiosResponse;

Expand Down Expand Up @@ -156,17 +156,4 @@ export default class HttpUtility {

return model;
}

/**
* We want to show the loading indicator to the user but sometimes the api
* request finished too quickly. This makes sure there the loading indicator is
* visual for at least a given time.
*
* @param duration
* @returns {Promise<unknown>}
* @private
*/
private static _delay(duration: number = 250): Promise<void> {
return new Promise((resolve) => setTimeout(resolve, duration));
}
}
3 changes: 3 additions & 0 deletions src/utilities/delay.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export const delay = (duration: number = 250): Promise<void> => {
return new Promise((resolve) => setTimeout(resolve, duration));
};