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

Kick jsonp - fixes #2682

Browse source
This commit is contained in:
Stephan Hoyer 2022-05-31 09:54:41 +02:00
parent efdb563fa5
commit 716d1e1804
16 changed files with 8 additions and 362 deletions
Download patch file Download diff file Expand all files Collapse all files

20
request/request.js
View file

@ -4,8 +4,6 @@ var buildPathname = require("../pathname/build")
var hasOwn = require("../util/hasOwn")
module.exports = function($window, oncompletion) {
var callbackCount = 0
function PromiseProxy(executor) {
return new Promise(executor)
}
@ -197,23 +195,5 @@ module.exports = function($window, oncompletion) {
else if (body instanceof $window.FormData || body instanceof $window.URLSearchParams) xhr.send(body)
else xhr.send(JSON.stringify(body))
}),
jsonp: makeRequest(function(url, args, resolve, reject) {
var callbackName = args.callbackName || "_mithril_" + Math.round(Math.random() * 1e16) + "_" + callbackCount++
var script = $window.document.createElement("script")
$window[callbackName] = function(data) {
delete $window[callbackName]
script.parentNode.removeChild(script)
resolve(data)
}
script.onerror = function() {
delete $window[callbackName]
script.parentNode.removeChild(script)
reject(new Error("JSONP request failed"))
}
script.src = url + (url.indexOf("?") < 0 ? "?" : "&") +
encodeURIComponent(args.callbackKey || "callback") + "=" +
encodeURIComponent(callbackName)
$window.document.documentElement.appendChild(script)
}),
}
}

116
request/tests/test-jsonp.js
View file

@ -1,116 +0,0 @@
"use strict"
var o = require("ospec")
var xhrMock = require("../../test-utils/xhrMock")
var Request = require("../../request/request")
var parseQueryString = require("../../querystring/parse")
o.spec("jsonp", function() {
var mock, jsonp, complete
o.beforeEach(function() {
mock = xhrMock()
complete = o.spy()
jsonp = Request(mock, complete).jsonp
})
o("works", function(done) {
mock.$defineRoutes({
"GET /item": function(request) {
var queryData = parseQueryString(request.query)
return {status: 200, responseText: queryData["callback"] + "(" + JSON.stringify({a: 1}) + ")"}
}
})
jsonp({url: "/item"}).then(function(data) {
o(data).deepEquals({a: 1})
}).then(done)
})
o("first argument can be a string aliasing url property", function(done){
mock.$defineRoutes({
"GET /item": function(request) {
var queryData = parseQueryString(request.query)
return {status: 200, responseText: queryData["callback"] + "(" + JSON.stringify({a: 1}) + ")"}
}
})
jsonp("/item").then(function(data) {
o(data).deepEquals({a: 1})
}).then(function() {
done()
})
})
o("works w/ other querystring params", function(done) {
mock.$defineRoutes({
"GET /item": function(request) {
var queryData = parseQueryString(request.query)
return {status: 200, responseText: queryData["callback"] + "(" + JSON.stringify(queryData) + ")"}
}
})
jsonp({url: "/item", params: {a: "b", c: "d"}}).then(function(data) {
delete data["callback"]
o(data).deepEquals({a: "b", c: "d"})
}).then(done)
})
o("works w/ custom callbackKey", function(done) {
mock.$defineRoutes({
"GET /item": function(request) {
var queryData = parseQueryString(request.query)
return {status: 200, responseText: queryData["cb"] + "(" + JSON.stringify({a: 2}) + ")"}
}
})
jsonp({url: "/item", callbackKey: "cb"}).then(function(data) {
o(data).deepEquals({a: 2})
}).then(done)
})
o("requests don't block each other", function(done) {
mock.$defineRoutes({
"GET /item": function(request) {
var queryData = parseQueryString(request.query)
return {status: 200, responseText: queryData["callback"] + "([])"}
}
})
jsonp("/item").then(function() {
return jsonp("/item")
})
jsonp("/item").then(function() {
return jsonp("/item")
})
setTimeout(function() {
o(complete.callCount).equals(4)
done()
}, 20)
})
o("requests trigger finally once with a chained then", function(done) {
mock.$defineRoutes({
"GET /item": function(request) {
var queryData = parseQueryString(request.query)
return {status: 200, responseText: queryData["callback"] + "([])"}
}
})
var promise = jsonp("/item")
promise.then(function() {}).then(function() {})
promise.then(function() {}).then(function() {})
setTimeout(function() {
o(complete.callCount).equals(1)
done()
}, 20)
})
o("requests does not trigger finally when background: true", function(done) {
mock.$defineRoutes({
"GET /item": function(request) {
var queryData = parseQueryString(request.query)
return {status: 200, responseText: queryData["callback"] + "([])"}
}
})
jsonp("/item", {background: true}).then(function() {})
setTimeout(function() {
o(complete.callCount).equals(0)
done()
}, 20)
})
o("handles error", function(done) {
jsonp({url: "/item", callbackKey: "cb"}).catch(function(e) {
o(e.message).equals("JSONP request failed")
done()
})
})
})