vndb/mithril-vndb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reject request on XHR timeout (#2646)

Browse source 
Co-authored-by: Zachary Hamm <hamm.zachary@gmail.com>
This commit is contained in:
Kevin Fiol 2020-12-23 05:42:03 -05:00 • committed by GitHub
parent 2b5c2f0fc6
commit f5b41aaf0f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 120 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

34
request/request.js
View file

@ -79,7 +79,7 @@ module.exports = function($window, Promise, oncompletion) {
var assumeJSON = (args.serialize == null || args.serialize === JSON.serialize) && !(body instanceof $window.FormData)
var responseType = args.responseType || (typeof args.extract === "function" ? "" : "json")
var xhr = new $window.XMLHttpRequest(), aborted = false
var xhr = new $window.XMLHttpRequest(), aborted = false, isTimeout = false
var original = xhr, replacedAbort
var abort = xhr.abort
@ -141,12 +141,25 @@ module.exports = function($window, Promise, oncompletion) {
}
if (success) resolve(response)
else {
try { message = ev.target.responseText }
catch (e) { message = response }
var error = new Error(message)
error.code = ev.target.status
error.response = response
reject(error)
var completeErrorResponse = function() {
try { message = ev.target.responseText }
catch (e) { message = response }
var error = new Error(message)
error.code = ev.target.status
error.response = response
reject(error)
}
if (xhr.status === 0) {
// Use setTimeout to push this code block onto the event queue
// This allows `xhr.ontimeout` to run in the case that there is a timeout
// Without this setTimeout, `xhr.ontimeout` doesn't have a chance to reject
// as `xhr.onreadystatechange` will run before it
setTimeout(function() {
if (isTimeout) return
completeErrorResponse()
})
} else completeErrorResponse()
}
}
catch (e) {
@ -155,6 +168,13 @@ module.exports = function($window, Promise, oncompletion) {
}
}
xhr.ontimeout = function (ev) {
isTimeout = true
var error = new Error("Request timed out")
error.code = ev.target.status
reject(error)
}
if (typeof args.config === "function") {
xhr = args.config(xhr, args, url) || xhr