Compare commits

...

2 Commits

3 changed files with 48 additions and 35 deletions

View File

@ -9,7 +9,7 @@ export const customInstance = <T>(
config: AxiosRequestConfig, config: AxiosRequestConfig,
options?: AxiosRequestConfig, options?: AxiosRequestConfig,
): CancelablePromise<T> => { ): CancelablePromise<T> => {
const source = Axios.CancelToken.source(); const abort = new AbortController();
/* /*
Hack to ensure that the data is passed to the request as an option. Hack to ensure that the data is passed to the request as an option.
@ -22,19 +22,24 @@ export const customInstance = <T>(
const instance = Axios.create({ baseURL: options?.baseURL }); const instance = Axios.create({ baseURL: options?.baseURL });
const promise = instance({ const promise = instance({
signal: abort.signal,
...config, ...config,
...options, ...options,
cancelToken: source.token, })
}).then(({data}) => data).catch((error) => { .then(({ data }) => data)
.catch((error) => {
if (Axios.isCancel(error)) { if (Axios.isCancel(error)) {
return; return;
} }
throw new S5Error((error as AxiosError).message, (error as AxiosError).response?.status as number); throw new S5Error(
}) (error as AxiosError).message,
(error as AxiosError).response?.status as number,
);
});
// @ts-ignore // @ts-ignore
promise.cancel = () => { promise.cancel = () => {
source.cancel("Query was cancelled"); abort.abort("Query was cancelled");
}; };
return promise as CancelablePromise<T>; return promise as CancelablePromise<T>;

View File

@ -18,6 +18,7 @@ export type CustomClientOptions = {
customCookie?: string; customCookie?: string;
onDownloadProgress?: (progressEvent: AxiosProgressEvent) => void; onDownloadProgress?: (progressEvent: AxiosProgressEvent) => void;
onUploadProgress?: (progressEvent: AxiosProgressEvent) => void; onUploadProgress?: (progressEvent: AxiosProgressEvent) => void;
httpConfig?: AxiosRequestConfig;
}; };
export function optionsToConfig( export function optionsToConfig(
@ -29,7 +30,7 @@ export function optionsToConfig(
| CustomRegistryOptions | CustomRegistryOptions
)[] )[]
): AxiosRequestConfig { ): AxiosRequestConfig {
const config: AxiosRequestConfig = {}; let config: AxiosRequestConfig = {};
config.baseURL = client.portalUrl; config.baseURL = client.portalUrl;
@ -75,5 +76,12 @@ export function optionsToConfig(
config.headers = headers; config.headers = headers;
if (finalOptions?.httpConfig) {
config = {
...config,
...finalOptions.httpConfig,
};
}
return config; return config;
} }