Track XHR replacements correctly (#2455)
* Track XHR replacements correctly Fixes #2439 * Update docs [skip ci]
This commit is contained in:
Isiah Meadows
GitHub
parent
7eee730c29
commit
8eed896859
7 changed files with 134 additions and 35 deletions
|
|
@ -79,13 +79,13 @@ module.exports = function($window, Promise) {
|
|||
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,
|
||||
_abort = xhr.abort
|
||||
var xhr = new $window.XMLHttpRequest(), aborted = false
|
||||
var original = xhr, replacedAbort
|
||||
var abort = xhr.abort
|
||||
|
||||
xhr.abort = function abort() {
|
||||
xhr.abort = function() {
|
||||
aborted = true
|
||||
_abort.call(xhr)
|
||||
abort.call(this)
|
||||
}
|
||||
|
||||
xhr.open(method, url, args.async !== false, typeof args.user === "string" ? args.user : undefined, typeof args.password === "string" ? args.password : undefined)
|
||||
|
|
@ -106,47 +106,45 @@ module.exports = function($window, Promise) {
|
|||
}
|
||||
}
|
||||
|
||||
if (typeof args.config === "function") xhr = args.config(xhr, args) || xhr
|
||||
|
||||
xhr.onreadystatechange = function() {
|
||||
xhr.onreadystatechange = function(ev) {
|
||||
// Don't throw errors on xhr.abort().
|
||||
if(aborted) return
|
||||
if (aborted) return
|
||||
|
||||
if (xhr.readyState === 4) {
|
||||
if (ev.target.readyState === 4) {
|
||||
try {
|
||||
var success = (xhr.status >= 200 && xhr.status < 300) || xhr.status === 304 || (/^file:\/\//i).test(url)
|
||||
var success = (ev.target.status >= 200 && ev.target.status < 300) || ev.target.status === 304 || (/^file:\/\//i).test(url)
|
||||
// When the response type isn't "" or "text",
|
||||
// `xhr.responseText` is the wrong thing to use.
|
||||
// Browsers do the right thing and throw here, and we
|
||||
// should honor that and do the right thing by
|
||||
// preferring `xhr.response` where possible/practical.
|
||||
var response = xhr.response, message
|
||||
var response = ev.target.response, message
|
||||
|
||||
if (responseType === "json") {
|
||||
// For IE and Edge, which don't implement
|
||||
// `responseType: "json"`.
|
||||
if (!xhr.responseType && typeof args.extract !== "function") response = JSON.parse(xhr.responseText)
|
||||
if (!ev.target.responseType && typeof args.extract !== "function") response = JSON.parse(ev.target.responseText)
|
||||
} else if (!responseType || responseType === "text") {
|
||||
// Only use this default if it's text. If a parsed
|
||||
// document is needed on old IE and friends (all
|
||||
// unsupported), the user should use a custom
|
||||
// `config` instead. They're already using this at
|
||||
// their own risk.
|
||||
if (response == null) response = xhr.responseText
|
||||
if (response == null) response = ev.target.responseText
|
||||
}
|
||||
|
||||
if (typeof args.extract === "function") {
|
||||
response = args.extract(xhr, args)
|
||||
response = args.extract(ev.target, args)
|
||||
success = true
|
||||
} else if (typeof args.deserialize === "function") {
|
||||
response = args.deserialize(response)
|
||||
}
|
||||
if (success) resolve(response)
|
||||
else {
|
||||
try { message = xhr.responseText }
|
||||
try { message = ev.target.responseText }
|
||||
catch (e) { message = response }
|
||||
var error = new Error(message)
|
||||
error.code = xhr.status
|
||||
error.code = ev.target.status
|
||||
error.response = response
|
||||
reject(error)
|
||||
}
|
||||
|
|
@ -157,6 +155,19 @@ module.exports = function($window, Promise) {
|
|||
}
|
||||
}
|
||||
|
||||
if (typeof args.config === "function") {
|
||||
xhr = args.config(xhr, args, url) || xhr
|
||||
|
||||
// Propagate the `abort` to any replacement XHR as well.
|
||||
if (xhr !== original) {
|
||||
replacedAbort = xhr.abort
|
||||
xhr.abort = function() {
|
||||
aborted = true
|
||||
replacedAbort.call(this)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (body == null) xhr.send()
|
||||
else if (typeof args.serialize === "function") xhr.send(args.serialize(body))
|
||||
else if (body instanceof $window.FormData) xhr.send(body)
|
||||
|
|
|
|||
|
|
@ -455,19 +455,15 @@ o.spec("request", function() {
|
|||
var failed = false
|
||||
var resolved = false
|
||||
function handleAbort(xhr) {
|
||||
var onreadystatechange = xhr.onreadystatechange // probably not set yet
|
||||
var testonreadystatechange = function() {
|
||||
onreadystatechange.call(xhr)
|
||||
var onreadystatechange = xhr.onreadystatechange
|
||||
xhr.onreadystatechange = function() {
|
||||
onreadystatechange.call(xhr, {target: xhr})
|
||||
setTimeout(function() { // allow promises to (not) resolve first
|
||||
o(failed).equals(false)
|
||||
o(resolved).equals(false)
|
||||
done()
|
||||
}, 0)
|
||||
}
|
||||
Object.defineProperty(xhr, "onreadystatechange", {
|
||||
set: function(val) { onreadystatechange = val },
|
||||
get: function() { return testonreadystatechange }
|
||||
})
|
||||
xhr.abort()
|
||||
}
|
||||
request({method: "GET", url: "/item", config: handleAbort}).catch(function() {
|
||||
|
|
@ -477,6 +473,40 @@ o.spec("request", function() {
|
|||
resolved = true
|
||||
})
|
||||
})
|
||||
o("doesn't fail on replaced abort", function(done) {
|
||||
mock.$defineRoutes({
|
||||
"GET /item": function() {
|
||||
return {status: 200, responseText: JSON.stringify({a: 1})}
|
||||
}
|
||||
})
|
||||
|
||||
var failed = false
|
||||
var resolved = false
|
||||
var abortSpy = o.spy()
|
||||
var replacement
|
||||
function handleAbort(xhr) {
|
||||
var onreadystatechange = xhr.onreadystatechange
|
||||
xhr.onreadystatechange = function() {
|
||||
onreadystatechange.call(xhr, {target: xhr})
|
||||
setTimeout(function() { // allow promises to (not) resolve first
|
||||
o(failed).equals(false)
|
||||
o(resolved).equals(false)
|
||||
done()
|
||||
}, 0)
|
||||
}
|
||||
return replacement = {
|
||||
send: xhr.send.bind(xhr),
|
||||
abort: abortSpy,
|
||||
}
|
||||
}
|
||||
request({method: "GET", url: "/item", config: handleAbort}).then(function() {
|
||||
resolved = true
|
||||
}, function() {
|
||||
failed = true
|
||||
})
|
||||
replacement.abort()
|
||||
o(abortSpy.callCount).equals(1)
|
||||
})
|
||||
o("doesn't fail on file:// status 0", function(done) {
|
||||
mock.$defineRoutes({
|
||||
"GET /item": function() {
|
||||
|
|
@ -521,18 +551,58 @@ o.spec("request", function() {
|
|||
}
|
||||
})
|
||||
})
|
||||
/*o("data maintains after interpolate", function() {
|
||||
o("params unmodified after interpolate", function() {
|
||||
mock.$defineRoutes({
|
||||
"PUT /items/:x": function() {
|
||||
return {status: 200, responseText: ""}
|
||||
"PUT /items/1": function() {
|
||||
return {status: 200, responseText: "[]"}
|
||||
}
|
||||
})
|
||||
var data = {x: 1, y: 2}
|
||||
var dataCopy = Object.assign({}, data);
|
||||
request({method: "PUT", url: "/items/:x", data})
|
||||
var params = {x: 1, y: 2}
|
||||
var p = request({method: "PUT", url: "/items/:x", params: params})
|
||||
|
||||
o(data).deepEquals(dataCopy)
|
||||
})*/
|
||||
o(params).deepEquals({x: 1, y: 2})
|
||||
|
||||
return p
|
||||
})
|
||||
o("can return replacement from config", function() {
|
||||
mock.$defineRoutes({
|
||||
"GET /a": function() {
|
||||
return {status: 200, responseText: "[]"}
|
||||
}
|
||||
})
|
||||
var result
|
||||
return request({
|
||||
url: "/a",
|
||||
config: function(xhr) {
|
||||
return result = {
|
||||
send: o.spy(xhr.send.bind(xhr)),
|
||||
}
|
||||
},
|
||||
})
|
||||
.then(function () {
|
||||
o(result.send.callCount).equals(1)
|
||||
})
|
||||
})
|
||||
o("can abort from replacement", function() {
|
||||
mock.$defineRoutes({
|
||||
"GET /a": function() {
|
||||
return {status: 200, responseText: "[]"}
|
||||
}
|
||||
})
|
||||
var result
|
||||
|
||||
request({
|
||||
url: "/a",
|
||||
config: function(xhr) {
|
||||
return result = {
|
||||
send: o.spy(xhr.send.bind(xhr)),
|
||||
abort: o.spy(),
|
||||
}
|
||||
},
|
||||
})
|
||||
|
||||
result.abort()
|
||||
})
|
||||
})
|
||||
o.spec("failure", function() {
|
||||
o("rejects on server error", function(done) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue