Merge pull request #28 from pleshevskiy/task-26
feat: add request cancelation
This commit is contained in:
GitHub
commit
0ea4541618
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
# misc
|
||||
.DS_Store
|
||||
.env
|
||||
/.env
|
||||
|
||||
npm-debug.log*
|
||||
yarn-debug.log*
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
SKIP_PREFLIGHT_CHECK=true
|
||||
|
|
@ -0,0 +1 @@
|
|||
[{"/home/janabhumi/sandbox/react-rest-request/examples/cancelation/src/index.tsx":"1","/home/janabhumi/sandbox/react-rest-request/examples/cancelation/src/app.tsx":"2","/home/janabhumi/sandbox/react-rest-request/examples/cancelation/src/pages.tsx":"3","/home/janabhumi/sandbox/react-rest-request/examples/cancelation/src/endpoint.ts":"4"},{"size":389,"mtime":1608684208907,"results":"5","hashOfConfig":"6"},{"size":485,"mtime":1608684628086,"results":"7","hashOfConfig":"6"},{"size":894,"mtime":1608689496251,"results":"8","hashOfConfig":"6"},{"size":285,"mtime":1608684386674,"results":"9","hashOfConfig":"6"},{"filePath":"10","messages":"11","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"12"},"v1vt4k",{"filePath":"13","messages":"14","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"12"},{"filePath":"15","messages":"16","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"17","messages":"18","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"12"},"/home/janabhumi/sandbox/react-rest-request/examples/cancelation/src/index.tsx",[],["19","20"],"/home/janabhumi/sandbox/react-rest-request/examples/cancelation/src/app.tsx",[],"/home/janabhumi/sandbox/react-rest-request/examples/cancelation/src/pages.tsx",[],"/home/janabhumi/sandbox/react-rest-request/examples/cancelation/src/endpoint.ts",[],{"ruleId":"21","replacedBy":"22"},{"ruleId":"23","replacedBy":"24"},"no-native-reassign",["25"],"no-negated-in-lhs",["26"],"no-global-assign","no-unsafe-negation"]
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
|
||||
|
||||
# dependencies
|
||||
/node_modules
|
||||
/.pnp
|
||||
.pnp.js
|
||||
|
||||
# testing
|
||||
/coverage
|
||||
|
||||
# production
|
||||
/build
|
||||
|
||||
# misc
|
||||
.DS_Store
|
||||
.env.local
|
||||
.env.development.local
|
||||
.env.test.local
|
||||
.env.production.local
|
||||
|
||||
npm-debug.log*
|
||||
yarn-debug.log*
|
||||
yarn-error.log*
|
||||
|
|
@ -0,0 +1,46 @@
|
|||
# Getting Started with Create React App
|
||||
|
||||
This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
|
||||
|
||||
## Available Scripts
|
||||
|
||||
In the project directory, you can run:
|
||||
|
||||
### `npm start`
|
||||
|
||||
Runs the app in the development mode.\
|
||||
Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
|
||||
|
||||
The page will reload if you make edits.\
|
||||
You will also see any lint errors in the console.
|
||||
|
||||
### `npm test`
|
||||
|
||||
Launches the test runner in the interactive watch mode.\
|
||||
See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
|
||||
|
||||
### `npm run build`
|
||||
|
||||
Builds the app for production to the `build` folder.\
|
||||
It correctly bundles React in production mode and optimizes the build for the best performance.
|
||||
|
||||
The build is minified and the filenames include the hashes.\
|
||||
Your app is ready to be deployed!
|
||||
|
||||
See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
|
||||
|
||||
### `npm run eject`
|
||||
|
||||
**Note: this is a one-way operation. Once you `eject`, you can’t go back!**
|
||||
|
||||
If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
|
||||
|
||||
Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own.
|
||||
|
||||
You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it.
|
||||
|
||||
## Learn More
|
||||
|
||||
You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
|
||||
|
||||
To learn React, check out the [React documentation](https://reactjs.org/).
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,48 @@
|
|||
{
|
||||
"name": "cancelation",
|
||||
"version": "0.1.0",
|
||||
"private": true,
|
||||
"dependencies": {
|
||||
"@testing-library/jest-dom": "^5.11.6",
|
||||
"@testing-library/react": "^11.2.2",
|
||||
"@testing-library/user-event": "^12.6.0",
|
||||
"@types/jest": "^26.0.19",
|
||||
"@types/node": "^12.19.9",
|
||||
"@types/react": "^16.14.2",
|
||||
"@types/react-dom": "^16.9.10",
|
||||
"react": "^17.0.1",
|
||||
"react-dom": "^17.0.1",
|
||||
"react-rest-request": "../../",
|
||||
"react-router-dom": "^5.2.0",
|
||||
"react-scripts": "4.0.1",
|
||||
"typescript": "^4.1.3",
|
||||
"web-vitals": "^0.2.4"
|
||||
},
|
||||
"scripts": {
|
||||
"start": "react-scripts start",
|
||||
"build": "react-scripts build",
|
||||
"test": "react-scripts test",
|
||||
"eject": "react-scripts eject"
|
||||
},
|
||||
"eslintConfig": {
|
||||
"extends": [
|
||||
"react-app",
|
||||
"react-app/jest"
|
||||
]
|
||||
},
|
||||
"browserslist": {
|
||||
"production": [
|
||||
">0.2%",
|
||||
"not dead",
|
||||
"not op_mini all"
|
||||
],
|
||||
"development": [
|
||||
"last 1 chrome version",
|
||||
"last 1 firefox version",
|
||||
"last 1 safari version"
|
||||
]
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/react-router-dom": "^5.1.6"
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,43 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
||||
<meta name="theme-color" content="#000000" />
|
||||
<meta
|
||||
name="description"
|
||||
content="Web site created using create-react-app"
|
||||
/>
|
||||
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
|
||||
<!--
|
||||
manifest.json provides metadata used when your web app is installed on a
|
||||
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
|
||||
-->
|
||||
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
|
||||
<!--
|
||||
Notice the use of %PUBLIC_URL% in the tags above.
|
||||
It will be replaced with the URL of the `public` folder during the build.
|
||||
Only files inside the `public` folder can be referenced from the HTML.
|
||||
|
||||
Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
|
||||
work correctly both with client-side routing and a non-root public URL.
|
||||
Learn how to configure a non-root public URL by running `npm run build`.
|
||||
-->
|
||||
<title>React App</title>
|
||||
</head>
|
||||
<body>
|
||||
<noscript>You need to enable JavaScript to run this app.</noscript>
|
||||
<div id="root"></div>
|
||||
<!--
|
||||
This HTML file is a template.
|
||||
If you open it directly in the browser, you will see an empty page.
|
||||
|
||||
You can add webfonts, meta tags, or analytics to this file.
|
||||
The build step will place the bundled scripts into the <body> tag.
|
||||
|
||||
To begin the development, run `npm start` or `yarn start`.
|
||||
To create a production bundle, use `npm run build` or `yarn build`.
|
||||
-->
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -0,0 +1,19 @@
|
|||
import React from 'react';
|
||||
import { BrowserRouter, Route, Switch } from 'react-router-dom'
|
||||
import { DelayPage, MainPage } from './pages';
|
||||
|
||||
|
||||
export default function App() {
|
||||
return (
|
||||
<BrowserRouter>
|
||||
<Switch>
|
||||
<Route exact path='/'>
|
||||
<MainPage />
|
||||
</Route>
|
||||
<Route exact path='/delay'>
|
||||
<DelayPage />
|
||||
</Route>
|
||||
</Switch>
|
||||
</BrowserRouter>
|
||||
)
|
||||
}
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
import { Endpoint, Method } from 'react-rest-request';
|
||||
|
||||
export const DelayEndpoint: Endpoint<{ url: string}, void, { seconds: number }> = {
|
||||
method: Method.GET,
|
||||
url: ({ seconds }) => `/delay/${seconds}`,
|
||||
transformResponseData({ url }: any) {
|
||||
return { url }
|
||||
}
|
||||
};
|
||||
|
|
@ -0,0 +1,17 @@
|
|||
import React from 'react';
|
||||
import ReactDOM from 'react-dom';
|
||||
import { RequestProvider, Client } from 'react-rest-request';
|
||||
import App from './app';
|
||||
|
||||
const client = new Client({
|
||||
baseUrl: 'https://httpbin.org',
|
||||
});
|
||||
|
||||
ReactDOM.render(
|
||||
<React.StrictMode>
|
||||
<RequestProvider client={client}>
|
||||
<App />
|
||||
</RequestProvider>
|
||||
</React.StrictMode>,
|
||||
document.getElementById('root')
|
||||
);
|
||||
|
|
@ -0,0 +1,35 @@
|
|||
import React from 'react';
|
||||
import { useRequest } from 'react-rest-request';
|
||||
import { Link } from 'react-router-dom';
|
||||
import { DelayEndpoint } from './endpoint';
|
||||
|
||||
|
||||
export function MainPage() {
|
||||
return <Link to='/delay'>Move to delay page</Link>
|
||||
}
|
||||
|
||||
export function DelayPage() {
|
||||
const { data, loading, cancel, isCanceled } = useRequest(
|
||||
DelayEndpoint,
|
||||
{
|
||||
params: {
|
||||
seconds: 10,
|
||||
}
|
||||
}
|
||||
);
|
||||
|
||||
return (
|
||||
<div>
|
||||
<div>
|
||||
<Link to='/'>Back to main page</Link>
|
||||
</div>
|
||||
{!data ? (
|
||||
<div>{ loading ? 'Loading...' : isCanceled ? 'Request was canceled' : 'Something went wrong' }</div>
|
||||
) : <div>Success</div>}
|
||||
|
||||
<button type='button' onClick={() => cancel() }>
|
||||
Cancel immediately!
|
||||
</button>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
|
@ -0,0 +1 @@
|
|||
/// <reference types="react-scripts" />
|
||||
|
|
@ -0,0 +1,26 @@
|
|||
{
|
||||
"compilerOptions": {
|
||||
"target": "es5",
|
||||
"lib": [
|
||||
"dom",
|
||||
"dom.iterable",
|
||||
"esnext"
|
||||
],
|
||||
"allowJs": true,
|
||||
"skipLibCheck": true,
|
||||
"esModuleInterop": true,
|
||||
"allowSyntheticDefaultImports": true,
|
||||
"strict": true,
|
||||
"forceConsistentCasingInFileNames": true,
|
||||
"noFallthroughCasesInSwitch": true,
|
||||
"module": "esnext",
|
||||
"moduleResolution": "node",
|
||||
"resolveJsonModule": true,
|
||||
"isolatedModules": true,
|
||||
"noEmit": true,
|
||||
"jsx": "react-jsx"
|
||||
},
|
||||
"include": [
|
||||
"src"
|
||||
]
|
||||
}
|
||||
|
|
@ -0,0 +1 @@
|
|||
SKIP_PREFLIGHT_CHECK=true
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -8,7 +8,7 @@
|
|||
"@testing-library/user-event": "^12.2.0",
|
||||
"react": "^17.0.1",
|
||||
"react-dom": "^17.0.1",
|
||||
"react-rest-request": "github:pleshevskiy/react-rest-request",
|
||||
"react-rest-request": "../../",
|
||||
"react-router-dom": "^5.2.0",
|
||||
"react-scripts": "4.0.0",
|
||||
"web-vitals": "^0.2.4"
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
],
|
||||
"scripts": {
|
||||
"test": "jest",
|
||||
"build": "rm -rf target && tsc",
|
||||
"build": "tsc",
|
||||
"prepublishOnly": "rm -rf target && tsc",
|
||||
"report-coverage": "cat coverage/lcov.info | coveralls"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -17,12 +17,17 @@ export type RequestProps<R> = PrepareRequestProps & {
|
|||
transformResponseData?: (data: unknown) => R,
|
||||
}
|
||||
|
||||
export type ClientResponse<Data extends Record<string, any>> = Readonly<
|
||||
export type ResponseWithError =
|
||||
Pick<Response, 'ok' | 'redirected' | 'status' | 'statusText' | 'type' | 'headers' | 'url'>
|
||||
& { data: Data }
|
||||
>
|
||||
& Readonly<{ error?: Error, canceled?: boolean }>
|
||||
|
||||
export type ClientResponse<Data extends Record<string, any>> =
|
||||
ResponseWithError
|
||||
& Readonly<{ data: Data }>
|
||||
|
||||
export class Client {
|
||||
private controller = new AbortController();
|
||||
|
||||
constructor(private config: ClientConfig) {}
|
||||
|
||||
public prepareRequest(props: PrepareRequestProps) {
|
||||
|
|
@ -82,10 +87,29 @@ export class Client {
|
|||
): Promise<ClientResponse<Data>> {
|
||||
const req = this.prepareRequest(restProps);
|
||||
|
||||
return fetch(req)
|
||||
return fetch(req, { signal: this.controller.signal })
|
||||
// TODO: need to check response headers and parse json only if content-type header is application/json
|
||||
.then(res => Promise.all([res, res.json(), false]))
|
||||
.then(([res, data]) => {
|
||||
.then(
|
||||
(res) => Promise.all([res, res.json()]),
|
||||
(err) => {
|
||||
const canceled = err.name === 'AbortError';
|
||||
return Promise.all([
|
||||
{
|
||||
ok: false,
|
||||
redirected: false,
|
||||
status: canceled ? 499 : 400,
|
||||
statusText: canceled ? 'Client Closed Request' : err.toString(),
|
||||
type: 'basic',
|
||||
headers: {},
|
||||
url: req.url,
|
||||
error: err,
|
||||
canceled,
|
||||
} as ResponseWithError,
|
||||
{}
|
||||
]);
|
||||
}
|
||||
)
|
||||
.then(([res, data]): ClientResponse<Data> => {
|
||||
return {
|
||||
ok: res.ok,
|
||||
redirected: res.redirected,
|
||||
|
|
@ -94,6 +118,8 @@ export class Client {
|
|||
type: res.type,
|
||||
headers: res.headers,
|
||||
url: res.url,
|
||||
error: 'error' in res ? res.error : undefined,
|
||||
canceled: 'canceled' in res ? res.canceled : false,
|
||||
data: isFunction(transformResponseData) ? transformResponseData(data) : data,
|
||||
};
|
||||
})
|
||||
|
|
@ -105,4 +131,9 @@ export class Client {
|
|||
return res;
|
||||
});
|
||||
}
|
||||
|
||||
public cancelRequest() {
|
||||
this.controller.abort();
|
||||
this.controller = new AbortController();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -30,16 +30,17 @@ export type LazyRequestHandlerConfig<E extends AnyEndpoint> = Readonly<
|
|||
export type RequestHandler<E extends AnyEndpoint> =
|
||||
(config?: LazyRequestHandlerConfig<E>) => Promise<ExtractEndpointResponse<E> | null>;
|
||||
|
||||
export type RefetchRequestHandler = () => void;
|
||||
|
||||
export type PublicRequestStateWithRefetch<E extends AnyEndpoint> =
|
||||
export type PublicRequestStateWithActions<E extends AnyEndpoint> =
|
||||
PublicRequestState<ExtractEndpointResponse<E>>
|
||||
& { refetch: RefetchRequestHandler };
|
||||
& {
|
||||
refetch: () => void,
|
||||
cancel: () => void,
|
||||
};
|
||||
|
||||
export function useLazyRequest<E extends AnyEndpoint>(
|
||||
endpoint: E,
|
||||
config?: LazyRequestConfigFromEndpoint<E>,
|
||||
): [RequestHandler<E>, PublicRequestStateWithRefetch<E>] {
|
||||
): [RequestHandler<E>, PublicRequestStateWithActions<E>] {
|
||||
const [client] = useClient();
|
||||
const { defaultHeaders } = useRequestContext();
|
||||
const [state, dispatch] = React.useReducer<RequestReducer<ExtractEndpointResponse<E>>>(
|
||||
|
|
@ -63,7 +64,7 @@ export function useLazyRequest<E extends AnyEndpoint>(
|
|||
|
||||
const handler = React.useCallback(
|
||||
(handlerConfig?: LazyRequestHandlerConfig<E>) => {
|
||||
if (state?.loading) {
|
||||
if (state?.loading || state?.isCanceled) {
|
||||
return Promise.resolve(null);
|
||||
}
|
||||
|
||||
|
|
@ -94,7 +95,8 @@ export function useLazyRequest<E extends AnyEndpoint>(
|
|||
};
|
||||
|
||||
if (
|
||||
isSameRequest
|
||||
state.isCalled
|
||||
&& isSameRequest
|
||||
&& state?.prevVariables && isEqual(state.prevVariables, variables)
|
||||
&& state?.prevHeaders && isEqual(state.prevHeaders, headers)
|
||||
&& !handlerConfig?.force
|
||||
|
|
@ -127,11 +129,13 @@ export function useLazyRequest<E extends AnyEndpoint>(
|
|||
|
||||
return response.data;
|
||||
},
|
||||
(response) => {
|
||||
(response: ClientResponse<ExtractEndpointResponse<E>>) => {
|
||||
dispatch({ type: 'failure', response });
|
||||
if (isFunction(onFailure)) {
|
||||
|
||||
if (!response.canceled && isFunction(onFailure)) {
|
||||
onFailure(response);
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
);
|
||||
|
|
@ -151,13 +155,26 @@ export function useLazyRequest<E extends AnyEndpoint>(
|
|||
[handler, prevHandlerConfig]
|
||||
);
|
||||
|
||||
React.useEffect(
|
||||
() => {
|
||||
return () => {
|
||||
dispatch({ type: 'cancel' });
|
||||
client.cancelRequest();
|
||||
};
|
||||
},
|
||||
[client]
|
||||
);
|
||||
|
||||
return [
|
||||
handler,
|
||||
{
|
||||
data: state.data,
|
||||
loading: state.loading,
|
||||
isCalled: state.isCalled,
|
||||
isCanceled: state.isCanceled,
|
||||
error: state.error,
|
||||
refetch,
|
||||
cancel: client.cancelRequest.bind(client),
|
||||
},
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,6 +4,8 @@ export type PublicRequestState<R> = Readonly<{
|
|||
data: R | null;
|
||||
loading: boolean;
|
||||
isCalled: boolean;
|
||||
isCanceled?: boolean;
|
||||
error?: Error;
|
||||
}>;
|
||||
|
||||
export type RequestState<R> = PublicRequestState<R> & Readonly<{
|
||||
|
|
@ -27,6 +29,9 @@ export type RequestAction<R> =
|
|||
type: 'failure',
|
||||
response: ClientResponse<R>
|
||||
}
|
||||
| {
|
||||
type: 'cancel'
|
||||
}
|
||||
|
||||
export type RequestReducer<R> = React.Reducer<RequestState<R>, RequestAction<R>>
|
||||
|
||||
|
|
@ -35,6 +40,8 @@ export function requestReducer<R>(state: RequestState<R>, action: RequestAction<
|
|||
case 'call': {
|
||||
return {
|
||||
...state,
|
||||
error: undefined,
|
||||
isCanceled: false,
|
||||
loading: true,
|
||||
isCalled: true,
|
||||
prevHeaders: action.headers,
|
||||
|
|
@ -54,7 +61,15 @@ export function requestReducer<R>(state: RequestState<R>, action: RequestAction<
|
|||
...state,
|
||||
loading: false,
|
||||
data: null,
|
||||
// TODO: need to append errors
|
||||
error: action.response.error,
|
||||
isCanceled: action.response.canceled,
|
||||
};
|
||||
}
|
||||
case 'cancel': {
|
||||
return {
|
||||
...state,
|
||||
isCanceled: false,
|
||||
error: undefined,
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,13 +11,19 @@ declare type PrepareRequestProps = {
|
|||
export declare type RequestProps<R> = PrepareRequestProps & {
|
||||
transformResponseData?: (data: unknown) => R;
|
||||
};
|
||||
export declare type ClientResponse<Data extends Record<string, any>> = Readonly<Pick<Response, 'ok' | 'redirected' | 'status' | 'statusText' | 'type' | 'headers' | 'url'> & {
|
||||
export declare type ResponseWithError = Pick<Response, 'ok' | 'redirected' | 'status' | 'statusText' | 'type' | 'headers' | 'url'> & Readonly<{
|
||||
error?: Error;
|
||||
canceled?: boolean;
|
||||
}>;
|
||||
export declare type ClientResponse<Data extends Record<string, any>> = ResponseWithError & Readonly<{
|
||||
data: Data;
|
||||
}>;
|
||||
export declare class Client {
|
||||
private config;
|
||||
private controller;
|
||||
constructor(config: ClientConfig);
|
||||
prepareRequest(props: PrepareRequestProps): Request;
|
||||
request<Data extends Record<string, any>>({ transformResponseData, ...restProps }: RequestProps<Data>): Promise<ClientResponse<Data>>;
|
||||
cancelRequest(): void;
|
||||
}
|
||||
export {};
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@ import { formDataFromObject, isFunction, urlSearchParamsFromObject } from './mis
|
|||
export class Client {
|
||||
constructor(config) {
|
||||
this.config = config;
|
||||
this.controller = new AbortController();
|
||||
}
|
||||
prepareRequest(props) {
|
||||
var _a;
|
||||
|
|
@ -48,9 +49,25 @@ export class Client {
|
|||
request(_a) {
|
||||
var { transformResponseData } = _a, restProps = __rest(_a, ["transformResponseData"]);
|
||||
const req = this.prepareRequest(restProps);
|
||||
return fetch(req)
|
||||
return fetch(req, { signal: this.controller.signal })
|
||||
// TODO: need to check response headers and parse json only if content-type header is application/json
|
||||
.then(res => Promise.all([res, res.json(), false]))
|
||||
.then((res) => Promise.all([res, res.json()]), (err) => {
|
||||
const canceled = err.name === 'AbortError';
|
||||
return Promise.all([
|
||||
{
|
||||
ok: false,
|
||||
redirected: false,
|
||||
status: canceled ? 499 : 400,
|
||||
statusText: canceled ? 'Client Closed Request' : err.toString(),
|
||||
type: 'basic',
|
||||
headers: {},
|
||||
url: req.url,
|
||||
error: err,
|
||||
canceled,
|
||||
},
|
||||
{}
|
||||
]);
|
||||
})
|
||||
.then(([res, data]) => {
|
||||
return {
|
||||
ok: res.ok,
|
||||
|
|
@ -60,6 +77,8 @@ export class Client {
|
|||
type: res.type,
|
||||
headers: res.headers,
|
||||
url: res.url,
|
||||
error: 'error' in res ? res.error : undefined,
|
||||
canceled: 'canceled' in res ? res.canceled : false,
|
||||
data: isFunction(transformResponseData) ? transformResponseData(data) : data,
|
||||
};
|
||||
})
|
||||
|
|
@ -70,4 +89,8 @@ export class Client {
|
|||
return res;
|
||||
});
|
||||
}
|
||||
cancelRequest() {
|
||||
this.controller.abort();
|
||||
this.controller = new AbortController();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,8 +13,8 @@ export declare type LazyRequestHandlerConfig<E extends AnyEndpoint> = Readonly<L
|
|||
force?: boolean;
|
||||
}>;
|
||||
export declare type RequestHandler<E extends AnyEndpoint> = (config?: LazyRequestHandlerConfig<E>) => Promise<ExtractEndpointResponse<E> | null>;
|
||||
export declare type RefetchRequestHandler = () => void;
|
||||
export declare type PublicRequestStateWithRefetch<E extends AnyEndpoint> = PublicRequestState<ExtractEndpointResponse<E>> & {
|
||||
refetch: RefetchRequestHandler;
|
||||
export declare type PublicRequestStateWithActions<E extends AnyEndpoint> = PublicRequestState<ExtractEndpointResponse<E>> & {
|
||||
refetch: () => void;
|
||||
cancel: () => void;
|
||||
};
|
||||
export declare function useLazyRequest<E extends AnyEndpoint>(endpoint: E, config?: LazyRequestConfigFromEndpoint<E>): [RequestHandler<E>, PublicRequestStateWithRefetch<E>];
|
||||
export declare function useLazyRequest<E extends AnyEndpoint>(endpoint: E, config?: LazyRequestConfigFromEndpoint<E>): [RequestHandler<E>, PublicRequestStateWithActions<E>];
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ export function useLazyRequest(endpoint, config) {
|
|||
}, [endpoint]);
|
||||
const handler = React.useCallback((handlerConfig) => {
|
||||
var _a, _b, _c;
|
||||
if (state === null || state === void 0 ? void 0 : state.loading) {
|
||||
if ((state === null || state === void 0 ? void 0 : state.loading) || (state === null || state === void 0 ? void 0 : state.isCanceled)) {
|
||||
return Promise.resolve(null);
|
||||
}
|
||||
let params;
|
||||
|
|
@ -38,7 +38,8 @@ export function useLazyRequest(endpoint, config) {
|
|||
}
|
||||
const variables = Object.assign(Object.assign({}, config === null || config === void 0 ? void 0 : config.variables), handlerConfig === null || handlerConfig === void 0 ? void 0 : handlerConfig.variables);
|
||||
const headers = Object.assign(Object.assign(Object.assign(Object.assign({}, defaultHeaders), endpoint.headers), config === null || config === void 0 ? void 0 : config.headers), handlerConfig === null || handlerConfig === void 0 ? void 0 : handlerConfig.headers);
|
||||
if (isSameRequest
|
||||
if (state.isCalled
|
||||
&& isSameRequest
|
||||
&& (state === null || state === void 0 ? void 0 : state.prevVariables) && isEqual(state.prevVariables, variables)
|
||||
&& (state === null || state === void 0 ? void 0 : state.prevHeaders) && isEqual(state.prevHeaders, headers)
|
||||
&& !(handlerConfig === null || handlerConfig === void 0 ? void 0 : handlerConfig.force)) {
|
||||
|
|
@ -60,7 +61,7 @@ export function useLazyRequest(endpoint, config) {
|
|||
return response.data;
|
||||
}, (response) => {
|
||||
dispatch({ type: 'failure', response });
|
||||
if (isFunction(onFailure)) {
|
||||
if (!response.canceled && isFunction(onFailure)) {
|
||||
onFailure(response);
|
||||
}
|
||||
return null;
|
||||
|
|
@ -71,13 +72,22 @@ export function useLazyRequest(endpoint, config) {
|
|||
handler(Object.assign(Object.assign({}, prevHandlerConfig), { force: true }));
|
||||
}
|
||||
}, [handler, prevHandlerConfig]);
|
||||
React.useEffect(() => {
|
||||
return () => {
|
||||
dispatch({ type: 'cancel' });
|
||||
client.cancelRequest();
|
||||
};
|
||||
}, [client]);
|
||||
return [
|
||||
handler,
|
||||
{
|
||||
data: state.data,
|
||||
loading: state.loading,
|
||||
isCalled: state.isCalled,
|
||||
isCanceled: state.isCanceled,
|
||||
error: state.error,
|
||||
refetch,
|
||||
cancel: client.cancelRequest.bind(client),
|
||||
},
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,6 +4,8 @@ export declare type PublicRequestState<R> = Readonly<{
|
|||
data: R | null;
|
||||
loading: boolean;
|
||||
isCalled: boolean;
|
||||
isCanceled?: boolean;
|
||||
error?: Error;
|
||||
}>;
|
||||
export declare type RequestState<R> = PublicRequestState<R> & Readonly<{
|
||||
prevHeaders?: Record<string, string>;
|
||||
|
|
@ -21,25 +23,33 @@ export declare type RequestAction<R> = {
|
|||
} | {
|
||||
type: 'failure';
|
||||
response: ClientResponse<R>;
|
||||
} | {
|
||||
type: 'cancel';
|
||||
};
|
||||
export declare type RequestReducer<R> = React.Reducer<RequestState<R>, RequestAction<R>>;
|
||||
export declare function requestReducer<R>(state: RequestState<R>, action: RequestAction<R>): {
|
||||
loading: boolean;
|
||||
isCalled: boolean;
|
||||
prevHeaders: Record<string, string>;
|
||||
prevVariables: Record<string, any>;
|
||||
prevParams: Record<string, any> | undefined;
|
||||
data: R | null;
|
||||
} | {
|
||||
loading: boolean;
|
||||
data: R;
|
||||
isCalled: boolean;
|
||||
isCanceled?: boolean | undefined;
|
||||
error?: Error | undefined;
|
||||
prevHeaders?: Record<string, string> | undefined;
|
||||
prevVariables?: Record<string, any> | undefined;
|
||||
prevParams?: Record<string, any> | undefined;
|
||||
} | {
|
||||
loading: boolean;
|
||||
data: null;
|
||||
error: Error | undefined;
|
||||
isCanceled: boolean | undefined;
|
||||
isCalled: boolean;
|
||||
prevHeaders?: Record<string, string> | undefined;
|
||||
prevVariables?: Record<string, any> | undefined;
|
||||
prevParams?: Record<string, any> | undefined;
|
||||
} | {
|
||||
isCanceled: boolean;
|
||||
error: undefined;
|
||||
data: R | null;
|
||||
loading: boolean;
|
||||
isCalled: boolean;
|
||||
prevHeaders?: Record<string, string> | undefined;
|
||||
prevVariables?: Record<string, any> | undefined;
|
||||
|
|
|
|||
|
|
@ -1,13 +1,16 @@
|
|||
export function requestReducer(state, action) {
|
||||
switch (action.type) {
|
||||
case 'call': {
|
||||
return Object.assign(Object.assign({}, state), { loading: true, isCalled: true, prevHeaders: action.headers, prevVariables: action.variables, prevParams: action.params });
|
||||
return Object.assign(Object.assign({}, state), { error: undefined, isCanceled: false, loading: true, isCalled: true, prevHeaders: action.headers, prevVariables: action.variables, prevParams: action.params });
|
||||
}
|
||||
case 'success': {
|
||||
return Object.assign(Object.assign({}, state), { loading: false, data: action.response.data });
|
||||
}
|
||||
case 'failure': {
|
||||
return Object.assign(Object.assign({}, state), { loading: false, data: null });
|
||||
return Object.assign(Object.assign({}, state), { loading: false, data: null, error: action.response.error, isCanceled: action.response.canceled });
|
||||
}
|
||||
case 'cancel': {
|
||||
return Object.assign(Object.assign({}, state), { isCanceled: false, error: undefined });
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,4 +3,4 @@ import { LazyRequestConfigFromEndpoint } from './lazy-request-hook';
|
|||
export declare type RequestConfigFromEndpoint<E extends AnyEndpoint> = Readonly<LazyRequestConfigFromEndpoint<E> & {
|
||||
skip?: boolean;
|
||||
}>;
|
||||
export declare function useRequest<E extends AnyEndpoint>(endpoint: E, config?: RequestConfigFromEndpoint<E>): import("./lazy-request-hook").PublicRequestStateWithRefetch<E>;
|
||||
export declare function useRequest<E extends AnyEndpoint>(endpoint: E, config?: RequestConfigFromEndpoint<E>): import("./lazy-request-hook").PublicRequestStateWithActions<E>;
|
||||
|
|
|
|||
Reference in New Issue