holm/bruno
1
0
Fork 0
forked from extern/bruno
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: fixed issue where cancelling requests was throwing an error (#146)

Browse Source
This commit is contained in:
Anoop M D 2023-04-20 11:19:12 +05:30
parent 8e0bc68ada
commit 86094cc054
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/bruno-app/src/providers/ReduxStore/slices/collections/actions.js
View File

@ -122,6 +122,12 @@ export const sendRequest = (item, collectionUid) => (dispatch, getState) => {
response: null response: null
}) })
); );
if(err && err.message === "Error invoking remote method 'send-http-request': Error: Request cancelled") {
console.log('>> request cancelled');
return;
}
console.log('>> sending request failed'); console.log('>> sending request failed');
console.log(err); console.log(err);
toast.error(err ? err.message : 'Something went wrong!'); toast.error(err ? err.message : 'Something went wrong!');

6
packages/bruno-electron/src/ipc/network/index.js
View File

@ -203,6 +203,12 @@ const registerNetworkIpc = (mainWindow, watcher, lastOpenedCollections) => {
// and need not be always a network error // and need not be always a network error
deleteCancelToken(cancelTokenUid); deleteCancelToken(cancelTokenUid);
if (axios.isCancel(error)) {
let error = new Error("Request cancelled");
error.isCancel = true;
return Promise.reject(error);
}
if(error.response) { if(error.response) {
return { return {
status: error.response.status, status: error.response.status,