Added cancellable requests for AxiosStrategy

This commit is contained in:
Andrew Bastin
2020-05-30 18:26:26 -04:00
parent e2e1432069
commit b2600d3ffd

View File

@@ -1,16 +1,39 @@
import axios from "axios" import axios from "axios"
let cancelSource = axios.CancelToken.source()
export const cancelRunningAxiosRequest = () => {
cancelSource.cancel()
// Create a new cancel token
cancelSource = axios.CancelToken.source()
}
const axiosWithProxy = async (req, { state }) => { const axiosWithProxy = async (req, { state }) => {
try {
const { data } = await axios.post( const { data } = await axios.post(
state.postwoman.settings.PROXY_URL || "https://postwoman.apollosoftware.xyz/", state.postwoman.settings.PROXY_URL || "https://postwoman.apollosoftware.xyz/",
req req,
{
cancelToken: cancelSource.token,
}
) )
return data return data
} catch (e) {
// Check if the throw is due to a cancellation
if (axios.isCancel(e)) {
throw "cancellation"
} else {
throw e
}
}
} }
const axiosWithoutProxy = async (req, _store) => { const axiosWithoutProxy = async (req, _store) => {
try {
const res = await axios({ const res = await axios({
...req, ...req,
cancelToken: cancelSource.token,
transformResponse: [ transformResponse: [
(data, headers) => { (data, headers) => {
// If the response has a JSON content type, try parsing it // If the response has a JSON content type, try parsing it
@@ -34,6 +57,13 @@ const axiosWithoutProxy = async (req, _store) => {
], ],
}) })
return res return res
} catch (e) {
if (axios.isCancel(e)) {
throw "cancellation"
} else {
throw e
}
}
} }
const axiosStrategy = (req, store) => { const axiosStrategy = (req, store) => {