javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-11-05 13:26:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #460 from NativeScript/xhr2

Browse Source 
FormData support added and fetch exposed in global context
This commit is contained in:
Vladimir Enchev
2015-07-20 16:48:38 +03:00
parent dea2e693c0 78781b971d
commit 20790c41ff
16 changed files with 679 additions and 575 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
CrossPlatformModules.csproj
View File

@@ -182,6 +182,7 @@
<TypeScriptCompile Include="apps\tests\frame-tests.ts" />
<TypeScriptCompile Include="apps\tests\gestures-tests.ts" />
<TypeScriptCompile Include="apps\tests\fetch-tests.ts" />
<TypeScriptCompile Include="apps\tests\xhr-tests.ts" />
<TypeScriptCompile Include="apps\tests\layouts\dock-layout-tests.ts" />
<TypeScriptCompile Include="apps\tests\pages\app.ts" />
<TypeScriptCompile Include="apps\tests\pages\file-load-test.ts" />
@@ -299,7 +300,6 @@
</TypeScriptCompile>
<TypeScriptCompile Include="es-collections.d.ts" />
<TypeScriptCompile Include="es6-promise.d.ts" />
<TypeScriptCompile Include="fetch\fetch.d.ts" />
<TypeScriptCompile Include="file-system\file-name-resolver.d.ts" />
<TypeScriptCompile Include="file-system\file-name-resolver.ts">
<DependentUpon>file-name-resolver.d.ts</DependentUpon>
@@ -1032,6 +1032,7 @@
</TypeScriptCompile>
<TypeScriptCompile Include="apps\xml-demo\app.ts" />
<TypeScriptCompile Include="apps\xml-demo\mainPage.ts" />
<TypeScriptCompile Include="xhr\xhr.ts" />
<TypeScriptCompile Include="xml\xml.d.ts" />
<TypeScriptCompile Include="data\observable-array\observable-array.d.ts" />
<TypeScriptCompile Include="apps\tests\observable-array-tests.ts" />
@@ -1688,6 +1689,10 @@
<Content Include="apps\list-view-demo\package.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="xhr\package.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="xhr\Readme.md" />
<None Include="js-libs\esprima\LICENSE.BSD" />
<Content Include="source-control.md" />
<Content Include="ui\segmented-bar\package.json">

45
apps/tests/fetch-tests.ts
View File

@@ -1,6 +1,5 @@
/* tslint:disable:no-unused-variable */
import TKUnit = require("./TKUnit");
import fetchModule = require("fetch");
import types = require("utils/types");
// <snippet module="fetch" title="fetch">
@@ -12,7 +11,7 @@ import types = require("utils/types");
// </snippet>
export var test_fetch_defined = function () {
TKUnit.assert(types.isDefined((fetchModule.fetch)), "Method fetch() should be defined!");
TKUnit.assert(types.isDefined((fetch)), "Method fetch() should be defined!");
};
export var test_fetch = function (done: (err: Error, res?: string) => void) {
@@ -20,10 +19,10 @@ export var test_fetch = function (done: (err: Error, res?: string) => void) {
// <snippet module="fetch" title="fetch">
// ### Get Response from URL
// ``` JavaScript
fetchModule.fetch("https://httpbin.org/get").then(function (r) {
fetch("https://httpbin.org/get").then(function (r) {
//// Argument (r) is Response!
// <hide>
TKUnit.assert(r instanceof fetchModule.Response, "Result from fetch() should be valid Response object! Actual result is: " + result);
TKUnit.assert(r instanceof Response, "Result from fetch() should be valid Response object! Actual result is: " + result);
done(null);
// </hide>
}, function (e) {
@@ -42,7 +41,7 @@ export var test_fetch_text = function (done: (err: Error, res?: string) => void)
// <snippet module="fetch" title="fetch">
// ### Get string from URL
// ``` JavaScript
fetchModule.fetch("https://httpbin.org/get").then(response => { return response.text(); }).then(function (r) {
fetch("https://httpbin.org/get").then(response => { return response.text(); }).then(function (r) {
//// Argument (r) is string!
// <hide>
TKUnit.assert(types.isString(r), "Result from text() should be string! Actual result is: " + r);
@@ -64,7 +63,7 @@ export var test_fetch_json = function (done: (err: Error, res?: string) => void)
// <snippet module="fetch" title="fetch">
// ### Get JSON from URL
// ``` JavaScript
fetchModule.fetch("https://httpbin.org/get").then(response => { return response.json(); }).then(function (r) {
fetch("https://httpbin.org/get").then(response => { return response.json(); }).then(function (r) {
//// Argument (r) is JSON object!
// <hide>
TKUnit.assert(types.isString(JSON.stringify(r)), "Result from json() should be JSON object! Actual result is: " + r);
@@ -86,7 +85,7 @@ export var test_fetch_blob = function (done: (err: Error, res?: string) => void)
// <snippet module="fetch" title="fetch">
// ### Get Blob from URL
// ``` JavaScript
fetchModule.fetch("https://httpbin.org/get").then(response => { return response.blob(); }).then(function (r) {
fetch("https://httpbin.org/get").then(response => { return response.blob(); }).then(function (r) {
//// Argument (r) is Blob object!
// <hide>
TKUnit.assert(r instanceof Blob, "Result from blob() should be Blob object! Actual result is: " + r);
@@ -108,7 +107,7 @@ export var test_fetch_arrayBuffer = function (done: (err: Error, res?: string) =
// <snippet module="fetch" title="fetch">
// ### Get ArrayBuffer from URL
// ``` JavaScript
fetchModule.fetch("https://httpbin.org/get").then(response => { return response.arrayBuffer(); }).then(function (r) {
fetch("https://httpbin.org/get").then(response => { return response.arrayBuffer(); }).then(function (r) {
//// Argument (r) is ArrayBuffer object!
// <hide>
TKUnit.assert(r instanceof ArrayBuffer, "Result from arrayBuffer() should be ArrayBuffer object! Actual result is: " + r);
@@ -123,6 +122,7 @@ export var test_fetch_arrayBuffer = function (done: (err: Error, res?: string) =
// ```
// </snippet>
};
*/
export var test_fetch_formData = function (done: (err: Error, res?: string) => void) {
var result;
@@ -130,7 +130,7 @@ export var test_fetch_formData = function (done: (err: Error, res?: string) => v
// <snippet module="fetch" title="fetch">
// ### Get FormData from URL
// ``` JavaScript
fetchModule.fetch("https://httpbin.org/get").then(response => { return response.formData(); }).then(function (r) {
fetch("https://httpbin.org/get").then(response => { return response.formData(); }).then(function (r) {
//// Argument (r) is FormData object!
// <hide>
TKUnit.assert(r instanceof FormData, "Result from formData() should be FormData object! Actual result is: " + r);
@@ -145,12 +145,12 @@ export var test_fetch_formData = function (done: (err: Error, res?: string) => v
// ```
// </snippet>
};
*/
export var test_fetch_fail_invalid_url = function (done) {
var completed: boolean;
var isReady = function () { return completed; }
fetchModule.fetch("hgfttp://httpbin.org/get").catch(function (e) {
fetch("hgfttp://httpbin.org/get").catch(function (e) {
completed = true;
done(null)
});
@@ -161,7 +161,7 @@ export var test_fetch_response_status = function (done) {
// <snippet module="fetch" title="fetch">
// ### Get Response status
// ``` fetch
fetchModule.fetch("https://httpbin.org/get").then(function (response) {
fetch("https://httpbin.org/get").then(function (response) {
//// Argument (response) is Response!
var statusCode = response.status;
// <hide>
@@ -188,7 +188,7 @@ export var test_fetch_response_headers = function (done) {
// <snippet module="fetch" title="fetch">
// ### Get response headers
// ``` JavaScript
fetchModule.fetch("https://httpbin.org/get").then(function (response) {
fetch("https://httpbin.org/get").then(function (response) {
//// Argument (response) is Response!
// var all = response.headers.getAll();
// <hide>
@@ -211,9 +211,9 @@ export var test_fetch_response_headers = function (done) {
};
export var test_fetch_headers_sent = function (done) {
var result: fetchModule.Headers;
var result: Headers;
fetchModule.fetch("https://httpbin.org/get", {
fetch("https://httpbin.org/get", {
method: "GET",
headers: { "Content-Type": "application/json" }
}).then(function (response) {
@@ -231,16 +231,19 @@ export var test_fetch_headers_sent = function (done) {
};
export var test_fetch_post_form_data = function (done) {
fetchModule.fetch("https://httpbin.org/post", {
var data = new FormData();
data.append("MyVariableOne", "ValueOne");
data.append("MyVariableTwo", "ValueTwo");
fetch("https://httpbin.org/post", {
method: "POST",
headers: { "Content-Type": "application/x-www-form-urlencoded" },
body: "MyVariableOne=ValueOne&MyVariableTwo=ValueTwo"
body: data
}).then(r => {
// return r.formData(); Uncomment this when FormData is available!
return r.json();
return r.formData();
}).then(function (r) {
try {
TKUnit.assert(r.form["MyVariableOne"] === "ValueOne" && r.form["MyVariableTwo"] === "ValueTwo", "Content not sent/received properly! Actual result is: " + r.form);
TKUnit.assert(r instanceof FormData, "Content not sent/received properly! Actual result is: " + r);
done(null);
}
catch (err) {
@@ -255,7 +258,7 @@ export var test_fetch_post_json = function (done) {
// <snippet module="fetch" title="fetch">
// ### Post JSON
// ``` JavaScript
fetchModule.fetch("https://httpbin.org/post", {
fetch("https://httpbin.org/post", {
method: "POST",
headers: { "Content-Type": "application/json" },
body: JSON.stringify({ MyVariableOne: "ValueOne", MyVariableTwo: "ValueTwo" })

291
apps/tests/http-tests.ts
View File

@@ -110,7 +110,7 @@ export var test_getImage = function (done) {
// <snippet module="http" title="http">
// ### Get Image from URL
// ``` JavaScript
http.getImage("http://www.google.com/images/errors/logo_sm_2.png").then(function (r) {
http.getImage("https://httpbin.org/image/png").then(function (r) {
//// Argument (r) is Image!
// <hide>
result = r;
@@ -309,7 +309,7 @@ export var test_request_responseContentToJSONShouldReturnJSON = function (done)
export var test_request_responseContentToImageShouldReturnCorrectImage = function (done) {
var result;
http.request({ url: "http://www.google.com/images/errors/logo_sm_2.png", method: "GET" }).then(function (response) {
http.request({ url: "https://httpbin.org/image/png", method: "GET" }).then(function (response) {
response.content.toImage().then((source) => {
result = source;
try {
@@ -333,15 +333,15 @@ export var test_request_headersSentAndReceivedProperly = function (done) {
method: "GET",
headers: { "Content-Type": "application/json" }
}).then(function (response) {
result = response.headers;
try {
TKUnit.assert(result["Content-Type"] === "application/json", "Headers not sent/received properly!");
done(null);
}
catch (err) {
done(err);
}
}, function (e) {
result = response.headers;
try {
TKUnit.assert(result["Content-Type"] === "application/json", "Headers not sent/received properly!");
done(null);
}
catch (err) {
done(err);
}
}, function (e) {
done(e);
});
};
@@ -355,15 +355,41 @@ export var test_request_contentSentAndReceivedProperly = function (done) {
headers: { "Content-Type": "application/x-www-form-urlencoded" },
content: "MyVariableOne=ValueOne&MyVariableTwo=ValueTwo"
}).then(function (response) {
result = response.content.toJSON();
try {
TKUnit.assert(result["form"]["MyVariableOne"] === "ValueOne" && result["form"]["MyVariableTwo"] === "ValueTwo", "Content not sent/received properly!");
done(null);
}
catch (err) {
done(err);
}
}, function (e) {
result = response.content.toJSON();
try {
TKUnit.assert(result["form"]["MyVariableOne"] === "ValueOne" && result["form"]["MyVariableTwo"] === "ValueTwo", "Content not sent/received properly!");
done(null);
}
catch (err) {
done(err);
}
}, function (e) {
done(e);
});
};
export var test_request_FormDataContentSentAndReceivedProperly = function (done) {
var result;
var data = new FormData();
data.append("MyVariableOne", "ValueOne");
data.append("MyVariableTwo", "ValueTwo");
http.request({
url: "https://httpbin.org/post",
method: "POST",
headers: { "Content-Type": "application/x-www-form-urlencoded" },
content: data
}).then(function (response) {
result = response.content.toJSON();
try {
TKUnit.assert(result["form"]["MyVariableOne"] === "ValueOne" && result["form"]["MyVariableTwo"] === "ValueTwo", "Content not sent/received properly!");
done(null);
}
catch (err) {
done(err);
}
}, function (e) {
done(e);
});
};
@@ -379,15 +405,15 @@ export var test_request_NonStringHeadersSentAndReceivedProperly = function (done
headers: { "Content-Type": "application/x-www-form-urlencoded", "Content-Length": postData.length },
content: postData
}).then(function (response) {
result = response.content.toJSON();
try {
TKUnit.assert(result["form"]["MyVariableOne"] === "ValueOne" && result["form"]["MyVariableTwo"] === "ValueTwo", "Content not sent/received properly!");
done(null);
}
catch (err) {
done(err);
}
}, function (e) {
result = response.content.toJSON();
try {
TKUnit.assert(result["form"]["MyVariableOne"] === "ValueOne" && result["form"]["MyVariableTwo"] === "ValueTwo", "Content not sent/received properly!");
done(null);
}
catch (err) {
done(err);
}
}, function (e) {
done(e);
});
};
@@ -404,24 +430,23 @@ export var test_request_jsonAsContentSentAndReceivedProperly = function (done) {
headers: { "Content-Type": "application/json" },
content: JSON.stringify({ MyVariableOne: "ValueOne", MyVariableTwo: "ValueTwo" })
}).then(function (response) {
// result = response.content.toJSON();
// <hide>
result = response.content.toJSON();
try
{
TKUnit.assert(result["json"]["MyVariableOne"] === "ValueOne" && result["json"]["MyVariableTwo"] === "ValueTwo", "Content not sent/received properly!");
done(null);
}
catch (err) {
done(err);
}
// result = response.content.toJSON();
// <hide>
result = response.content.toJSON();
try {
TKUnit.assert(result["json"]["MyVariableOne"] === "ValueOne" && result["json"]["MyVariableTwo"] === "ValueTwo", "Content not sent/received properly!");
done(null);
}
catch (err) {
done(err);
}
// </hide>
// console.log(result);
}, function (e) {
// <hide>
}, function (e) {
// <hide>
done(e);
// </hide>
// console.log("Error occurred " + e);
// </hide>
// console.log("Error occurred " + e);
});
// ```
// </snippet>
@@ -452,180 +477,4 @@ function doRequest(url: string, done: Function) {
}, function (e) {
done(e);
});
}
export var test_XMLHttpRequest_isDefined = function () {
TKUnit.assert(types.isDefined(global["XMLHttpRequest"]), "XMLHttpRequest should be defined!");
};
var xhr = new XMLHttpRequest();
export var test_XMLHttpRequest_open_isDefined = function () {
TKUnit.assert(types.isFunction(xhr.open), "XMLHttpRequest.open should be defined!");
};
export var test_XMLHttpRequest_send_isDefined = function () {
TKUnit.assert(types.isFunction(xhr.send), "XMLHttpRequest.send should be defined!");
};
export var test_XMLHttpRequest_setRequestHeader_isDefined = function () {
TKUnit.assert(types.isFunction(xhr.setRequestHeader), "XMLHttpRequest.setRequestHeader should be defined!");
};
export var test_XMLHttpRequest_getAllResponseHeaders_isDefined = function () {
TKUnit.assert(types.isFunction(xhr.getAllResponseHeaders), "XMLHttpRequest.getAllResponseHeaders should be defined!");
};
export var test_XMLHttpRequest_getResponseHeader_isDefined = function () {
TKUnit.assert(types.isFunction(xhr.getResponseHeader), "XMLHttpRequest.getResponseHeader should be defined!");
};
export var test_XMLHttpRequest_overrideMimeType_isDefined = function () {
TKUnit.assert(types.isFunction(xhr.overrideMimeType), "XMLHttpRequest.overrideMimeType should be defined!");
};
export var test_XMLHttpRequest_readyState_isDefined = function () {
TKUnit.assert(types.isDefined(xhr.readyState), "XMLHttpRequest.readyState should be defined!");
};
export var test_XMLHttpRequest_responseText_isDefined = function () {
TKUnit.assert(types.isDefined(xhr.responseText), "XMLHttpRequest.responseText should be defined!");
};
export var test_XMLHttpRequest_readyStateShouldChange = function (done) {
var count = 0;
xhr = new XMLHttpRequest();
TKUnit.assert(xhr.readyState === 0, "xhr.readyState should be UNSENT!");
xhr.onreadystatechange = function () {
try {
if (count === 0) {
TKUnit.assert(xhr.readyState === 1, "xhr.readyState should be OPEN!");
} else if (count === 1) {
TKUnit.assert(xhr.readyState === 2, "xhr.readyState should be HEADERS_RECEIVED!");
} else if (count === 2) {
TKUnit.assert(xhr.readyState === 3, "xhr.readyState should be LOADING!");
} else if (count === 3) {
TKUnit.assert(xhr.readyState === 4, "xhr.readyState should be DONE!");
}
count++;
done(null);
}
catch (err) {
done(err);
}
};
xhr.open("GET", "https://httpbin.org/get");
xhr.send();
};
export var test_XMLHttpRequest_headersSentAndReceivedProperly = function (done) {
xhr = new XMLHttpRequest();
xhr.open("GET", "https://httpbin.org/get");
xhr.setRequestHeader("Content-Type", "application/json");
xhr.onreadystatechange = function () {
if (xhr.readyState > 1) {
try {
TKUnit.assert(xhr.getResponseHeader("Content-Type") === "application/json", "Headers not sent/received properly!");
done(null);
}
catch (err) {
done(err);
}
}
};
xhr.send();
};
export var test_XMLHttpRequest_contentSentAndReceivedProperly = function (done) {
xhr = new XMLHttpRequest();
xhr.open("POST", "https://httpbin.org/post");
xhr.setRequestHeader("Content-Type", "application/json");
xhr.onreadystatechange = function () {
if (xhr.readyState > 3) {
var result = JSON.parse(xhr.responseText);
try {
TKUnit.assert(result["json"]["MyVariableOne"] === "ValueOne" && result["json"]["MyVariableTwo"] === "ValueTwo", "Content not sent/received properly!");
done(null);
}
catch (err) {
done(err);
}
}
};
xhr.send(JSON.stringify({ MyVariableOne: "ValueOne", MyVariableTwo: "ValueTwo" }));
};
export var test_XMLHttpRequest_abortShouldCancelonreadystatechange = function (done) {
var flag = false;
xhr = new XMLHttpRequest();
xhr.open("POST", "https://httpbin.org/post");
xhr.setRequestHeader("Content-Type", "application/json");
xhr.onreadystatechange = function () {
flag = true;
};
xhr.send(JSON.stringify({ MyVariableOne: "ValueOne", MyVariableTwo: "ValueTwo" }));
xhr.abort();
TKUnit.assert(flag === false, "Content not sent/received properly!");
done(null);
};
export var test_XMLHttpRequest_requestShouldBePossibleAfterAbort = function (done) {
xhr = new XMLHttpRequest();
xhr.open("POST", "https://httpbin.org/post");
xhr.setRequestHeader("Content-Type", "application/json");
xhr.onreadystatechange = function () {
if (xhr.readyState > 3) {
var result = JSON.parse(xhr.responseText);
try {
TKUnit.assert(result["json"]["MyVariableOne"] === "ValueOne" && result["json"]["MyVariableTwo"] === "ValueTwo", "Content not sent/received properly!");
done(null);
}
catch (err) {
done(err);
}
}
};
xhr.send(JSON.stringify({ MyVariableOne: "ValueOne", MyVariableTwo: "ValueTwo" }));
xhr.abort();
xhr.send(JSON.stringify({ MyVariableOne: "ValueOne", MyVariableTwo: "ValueTwo" }));
};
export function test_raises_onload_Event(done) {
let xhr = new XMLHttpRequest();
xhr.onload = () => {
done(null);
}
xhr.open("GET", "https://httpbin.org/get");
xhr.send();
}
export function test_raises_onerror_Event(done) {
let xhr = new XMLHttpRequest();
xhr.onerror = () => {
done(null);
}
xhr.open("GET", "https://no-such-domain-httpbin.org");
xhr.send();
}
export function test_responseType(done) {
let xhr = new XMLHttpRequest();
xhr.responseType = "";
xhr.responseType = "text";
TKUnit.assertThrows(
() => xhr.responseType = "json",
"Didn't raise on unsupported type.",
"Response type of 'json' not supported."
);
done(null);
}
};

1
apps/tests/testRunner.ts
View File

@@ -36,6 +36,7 @@ allTests["STYLE-PROPERTIES"] = require("./ui/style/style-properties-tests");
allTests["SCROLL-VIEW"] = require("./ui/scroll-view/scroll-view-tests");
allTests["FILE SYSTEM"] = require("./file-system-tests");
allTests["HTTP"] = require("./http-tests");
allTests["XHR"] = require("./xhr-tests");
allTests["FETCH"] = require("./fetch-tests");
allTests["APPLICATION SETTINGS"] = require("./application-settings-tests");
allTests["IMAGE SOURCE"] = require("./image-source-tests");

208
apps/tests/xhr-tests.ts Normal file
View File

@@ -0,0 +1,208 @@
/* tslint:disable:no-unused-variable */
import TKUnit = require("./TKUnit");
import types = require("utils/types");
export var test_XMLHttpRequest_isDefined = function () {
TKUnit.assert(types.isDefined(global["XMLHttpRequest"]), "XMLHttpRequest should be defined!");
};
var xhr = new XMLHttpRequest();
export var test_XMLHttpRequest_open_isDefined = function () {
TKUnit.assert(types.isFunction(xhr.open), "XMLHttpRequest.open should be defined!");
};
export var test_XMLHttpRequest_send_isDefined = function () {
TKUnit.assert(types.isFunction(xhr.send), "XMLHttpRequest.send should be defined!");
};
export var test_XMLHttpRequest_setRequestHeader_isDefined = function () {
TKUnit.assert(types.isFunction(xhr.setRequestHeader), "XMLHttpRequest.setRequestHeader should be defined!");
};
export var test_XMLHttpRequest_getAllResponseHeaders_isDefined = function () {
TKUnit.assert(types.isFunction(xhr.getAllResponseHeaders), "XMLHttpRequest.getAllResponseHeaders should be defined!");
};
export var test_XMLHttpRequest_getResponseHeader_isDefined = function () {
TKUnit.assert(types.isFunction(xhr.getResponseHeader), "XMLHttpRequest.getResponseHeader should be defined!");
};
export var test_XMLHttpRequest_overrideMimeType_isDefined = function () {
TKUnit.assert(types.isFunction(xhr.overrideMimeType), "XMLHttpRequest.overrideMimeType should be defined!");
};
export var test_XMLHttpRequest_readyState_isDefined = function () {
TKUnit.assert(types.isNumber(xhr.readyState), "XMLHttpRequest.readyState should be defined!");
};
export var test_XMLHttpRequest_responseText_isDefined = function () {
TKUnit.assert(types.isString(xhr.responseText), "XMLHttpRequest.responseText should be defined!");
};
export var test_XMLHttpRequest_responseType_isDefined = function () {
TKUnit.assert(types.isString(xhr.responseType), "XMLHttpRequest.responseType should be defined!");
};
export var test_XMLHttpRequest_readyStateShouldChange = function (done) {
var count = 0;
xhr = new XMLHttpRequest();
TKUnit.assert(xhr.readyState === 0, "xhr.readyState should be UNSENT!");
xhr.onreadystatechange = function () {
try {
if (count === 0) {
TKUnit.assert(xhr.readyState === 1, "xhr.readyState should be OPEN!");
} else if (count === 1) {
TKUnit.assert(xhr.readyState === 2, "xhr.readyState should be HEADERS_RECEIVED!");
} else if (count === 2) {
TKUnit.assert(xhr.readyState === 3, "xhr.readyState should be LOADING!");
} else if (count === 3) {
TKUnit.assert(xhr.readyState === 4, "xhr.readyState should be DONE!");
}
count++;
done(null);
}
catch (err) {
done(err);
}
};
xhr.open("GET", "https://httpbin.org/get");
xhr.send();
};
export var test_XMLHttpRequest_headersSentAndReceivedProperly = function (done) {
xhr = new XMLHttpRequest();
xhr.open("GET", "https://httpbin.org/get");
xhr.setRequestHeader("Content-Type", "application/json");
xhr.onreadystatechange = function () {
if (xhr.readyState > 1) {
try {
TKUnit.assert(xhr.getResponseHeader("Content-Type") === "application/json", "Headers not sent/received properly!");
done(null);
}
catch (err) {
done(err);
}
}
};
xhr.send();
};
export var test_XMLHttpRequest_contentSentAndReceivedProperly = function (done) {
xhr = new XMLHttpRequest();
xhr.open("POST", "https://httpbin.org/post");
xhr.setRequestHeader("Content-Type", "application/json");
xhr.onreadystatechange = function () {
if (xhr.readyState > 3) {
var result = JSON.parse(xhr.responseText);
try {
TKUnit.assert(result["json"]["MyVariableOne"] === "ValueOne" && result["json"]["MyVariableTwo"] === "ValueTwo", "Content not sent/received properly!");
done(null);
}
catch (err) {
done(err);
}
}
};
xhr.send(JSON.stringify({ MyVariableOne: "ValueOne", MyVariableTwo: "ValueTwo" }));
};
export var test_XMLHttpRequest_FormDataContentSentAndReceivedProperly = function (done) {
xhr = new XMLHttpRequest();
xhr.open("POST", "https://httpbin.org/post");
xhr.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
xhr.onreadystatechange = function () {
if (xhr.readyState > 3) {
var result = JSON.parse(xhr.responseText);
try {
TKUnit.assert(result["form"]["MyVariableOne"] === "ValueOne" && result["form"]["MyVariableTwo"] === "ValueTwo", "Content not sent/received properly! Result is: " + xhr.responseText);
done(null);
}
catch (err) {
done(err);
}
}
};
var data = new FormData();
data.append("MyVariableOne", "ValueOne");
data.append("MyVariableTwo", "ValueTwo");
xhr.send(data);
};
export var test_XMLHttpRequest_abortShouldCancelonreadystatechange = function (done) {
var flag = false;
xhr = new XMLHttpRequest();
xhr.open("POST", "https://httpbin.org/post");
xhr.setRequestHeader("Content-Type", "application/json");
xhr.onreadystatechange = function () {
flag = true;
};
xhr.send(JSON.stringify({ MyVariableOne: "ValueOne", MyVariableTwo: "ValueTwo" }));
xhr.abort();
TKUnit.assert(flag === false, "Content not sent/received properly!");
done(null);
};
export var test_XMLHttpRequest_requestShouldBePossibleAfterAbort = function (done) {
xhr = new XMLHttpRequest();
xhr.open("POST", "https://httpbin.org/post");
xhr.setRequestHeader("Content-Type", "application/json");
xhr.onreadystatechange = function () {
if (xhr.readyState > 3) {
var result = JSON.parse(xhr.responseText);
try {
TKUnit.assert(result["json"]["MyVariableOne"] === "ValueOne" && result["json"]["MyVariableTwo"] === "ValueTwo", "Content not sent/received properly!");
done(null);
}
catch (err) {
done(err);
}
}
};
xhr.send(JSON.stringify({ MyVariableOne: "ValueOne", MyVariableTwo: "ValueTwo" }));
xhr.abort();
xhr.send(JSON.stringify({ MyVariableOne: "ValueOne", MyVariableTwo: "ValueTwo" }));
};
export function test_raises_onload_Event(done) {
let xhr = new XMLHttpRequest();
xhr.onload = () => {
done(null);
}
xhr.open("GET", "https://httpbin.org/get");
xhr.send();
}
export function test_raises_onerror_Event(done) {
let xhr = new XMLHttpRequest();
xhr.onerror = () => {
done(null);
}
xhr.open("GET", "https://no-such-domain-httpbin.org");
xhr.send();
}
export function test_responseType(done) {
let xhr = new XMLHttpRequest();
xhr.responseType = "";
xhr.responseType = "text";
xhr.responseType = "json";
TKUnit.assertThrows(
() => xhr.responseType = "arraybuffer",
"Didn't raise on unsupported type.",
"Response type of 'arraybuffer' not supported."
);
done(null);
}

84
declarations.d.ts vendored
View File

@@ -1,4 +1,88 @@
/* tslint:disable:no-unused-variable */
declare class Request {
constructor(input: string|Request, init?: RequestInit);
method: string;
url: string;
headers: Headers;
context: RequestContext;
referrer: string;
mode: RequestMode;
credentials: RequestCredentials;
cache: RequestCache;
}
interface RequestInit {
method?: string;
headers?: HeaderInit|{ [index: string]: string };
body?: BodyInit;
mode?: RequestMode;
credentials?: RequestCredentials;
cache?: RequestCache;
}
declare enum RequestContext {
"audio", "beacon", "cspreport", "download", "embed", "eventsource", "favicon", "fetch",
"font", "form", "frame", "hyperlink", "iframe", "image", "imageset", "import",
"internal", "location", "manifest", "object", "ping", "plugin", "prefetch", "script",
"serviceworker", "sharedworker", "subresource", "style", "track", "video", "worker",
"xmlhttprequest", "xslt"
}
declare enum RequestMode { "same-origin", "no-cors", "cors" }
declare enum RequestCredentials { "omit", "same-origin", "include" }
declare enum RequestCache { "default", "no-store", "reload", "no-cache", "force-cache", "only-if-cached" }
declare class Headers {
append(name: string, value: string): void;
delete(name: string): void;
get(name: string): string;
getAll(name: string): Array<string>;
has(name: string): boolean;
set(name: string, value: string): void;
}
declare class Body {
bodyUsed: boolean;
/*
arrayBuffer(): Promise<ArrayBuffer>;
blob(): Promise<Blob>;
*/
formData(): Promise<FormData>;
json(): Promise<any>;
text(): Promise<string>;
}
declare class Response extends Body {
constructor(body?: BodyInit, init?: ResponseInit);
error(): Response;
redirect(url: string, status: number): Response;
type: ResponseType;
url: string;
status: number;
ok: boolean;
statusText: string;
headers: Headers;
clone(): Response;
}
declare enum ResponseType { "basic", "cors", "default", "error", "opaque" }
declare class ResponseInit {
status: number;
statusText: string;
headers: HeaderInit;
}
declare type HeaderInit = Headers|Array<string>;
declare type BodyInit = Blob|FormData|string;
declare type RequestInfo = Request|string;
declare function fetch(url: string, init?: RequestInit): Promise<Response>;
interface XMLHttpRequest {
send(data?: FormData): void;
}
interface Console {
time(reportName: string): void;
timeEnd(reportName: string): void;

90
fetch/fetch.d.ts vendored
View File

@@ -1,90 +0,0 @@
// Type definitions for fetch API
// Project: https://github.com/github/fetch
// Definitions by: Ryan Graham <https://github.com/ryan-codingintrigue>
// Definitions: https://github.com/borisyankov/DefinitelyTyped
/// <reference path="../es6-promise.d.ts" />
declare module "fetch" {
class Request {
constructor(input: string|Request, init?: RequestInit);
method: string;
url: string;
headers: Headers;
context: RequestContext;
referrer: string;
mode: RequestMode;
credentials: RequestCredentials;
cache: RequestCache;
}
interface RequestInit {
method?: string;
headers?: HeaderInit|{ [index: string]: string };
body?: BodyInit;
mode?: RequestMode;
credentials?: RequestCredentials;
cache?: RequestCache;
}
enum RequestContext {
"audio", "beacon", "cspreport", "download", "embed", "eventsource", "favicon", "fetch",
"font", "form", "frame", "hyperlink", "iframe", "image", "imageset", "import",
"internal", "location", "manifest", "object", "ping", "plugin", "prefetch", "script",
"serviceworker", "sharedworker", "subresource", "style", "track", "video", "worker",
"xmlhttprequest", "xslt"
}
enum RequestMode { "same-origin", "no-cors", "cors" }
enum RequestCredentials { "omit", "same-origin", "include" }
enum RequestCache { "default", "no-store", "reload", "no-cache", "force-cache", "only-if-cached" }
class Headers {
append(name: string, value: string): void;
delete(name: string): void;
get(name: string): string;
getAll(name: string): Array<string>;
has(name: string): boolean;
set(name: string, value: string): void;
}
class Body {
bodyUsed: boolean;
/*
arrayBuffer(): Promise<ArrayBuffer>;
blob(): Promise<Blob>;
formData(): Promise<FormData>;
*/
json(): Promise<any>;
text(): Promise<string>;
}
class Response extends Body {
constructor(body?: BodyInit, init?: ResponseInit);
error(): Response;
redirect(url: string, status: number): Response;
type: ResponseType;
url: string;
status: number;
ok: boolean;
statusText: string;
headers: Headers;
clone(): Response;
}
enum ResponseType { "basic", "cors", "default", "error", "opaque" }
class ResponseInit {
status: number;
statusText: string;
headers: HeaderInit;
}
type HeaderInit = Headers|Array<string>;
type BodyInit = Blob|FormData|string;
type RequestInfo = Request|string;
/* tslint:disable */
function fetch(url: string, init?: RequestInit): Promise<Response>;
}

4
fetch/fetch.js
View File

@@ -110,7 +110,7 @@
}
var support = {
blob: 'FileReader' in self && 'Blob' in self && (function () {
blob: 'FileReader' in global && 'Blob' in global && (function () {
try {
new Blob();
return true
@@ -118,7 +118,7 @@
return false
}
})(),
formData: 'FormData' in self
formData: 'FormData' in global
}
function Body() {

8
globals/globals.ts
View File

@@ -1,7 +1,7 @@
import types = require("utils/types");
import timer = require("timer");
import consoleModule = require("console");
import http = require("http");
import xhr = require("xhr/xhr");
import dialogs = require("ui/dialogs");
global.setTimeout = timer.setTimeout;
@@ -14,9 +14,13 @@ if (types.isUndefined(global.NSObject)) {
global.console = new consoleModule.Console();
}
global.XMLHttpRequest = (<any>http).XMLHttpRequest;
global.XMLHttpRequest = xhr.XMLHttpRequest;
global.FormData = xhr.FormData;
global.alert = dialogs.alert;
var fetchModule = require("fetch");
require("utils/module-merge").merge(fetchModule, global);
export function Deprecated(target: Object, key?: string | symbol, descriptor?: any) {
if (descriptor) {
var originalMethod = descriptor.value;

4
http/http-request.android.ts
View File

@@ -73,8 +73,8 @@ function buildJavaOptions(options: http.HttpRequestOptions) {
if (types.isString(options.method)) {
javaOptions.method = options.method;
}
if (options.content) {
javaOptions.content = options.content;
if (types.isString(options.content) || options.content instanceof FormData) {
javaOptions.content = options.content.toString();
}
if (types.isNumber(options.timeout)) {
javaOptions.timeout = options.timeout;

4
http/http-request.ios.ts
View File

@@ -32,8 +32,8 @@ export function request(options: http.HttpRequestOptions): Promise<http.HttpResp
}
}
if (types.isString(options.content)) {
urlRequest.HTTPBody = NSString.alloc().initWithString(options.content).dataUsingEncoding(4);
if (types.isString(options.content) || options.content instanceof FormData) {
urlRequest.HTTPBody = NSString.alloc().initWithString(options.content.toString()).dataUsingEncoding(4);
}
if (types.isNumber(options.timeout)) {

2
http/http.d.ts vendored
View File

@@ -69,7 +69,7 @@ declare module "http" {
/**
* Gets or sets the request body.
*/
content?: string;
content?: string | FormData;
/**
* Gets or sets the request timeout in milliseconds.

236
http/http.ts
View File

@@ -1,10 +1,6 @@
import image = require("image-source");
import definition = require("http");
import httpRequest = require("http/http-request");
import types = require("utils/types");
// merge the exports of the request file with the exports of this file
declare var exports;
require("utils/module-merge").merge(httpRequest, exports);
@@ -27,233 +23,7 @@ export function getImage(arg: any): Promise<image.ImageSource> {
return new Promise<image.ImageSource>((resolve, reject) => {
httpRequest.request(typeof arg === "string" ? { url: arg, method: "GET" } : arg)
.then(r => {
r.content.toImage().then(source => resolve(source));
}, e => reject(e));
r.content.toImage().then(source => resolve(source));
}, e => reject(e));
});
}
export class XMLHttpRequest {
public UNSENT = 0;
public OPENED = 1;
public HEADERS_RECEIVED = 2;
public LOADING = 3;
public DONE = 4;
public onload: () => void;
public onerror: () => void;
private _options: definition.HttpRequestOptions;
private _readyState: number;
private _status: number;
private _response: any;
private _responseText: string = "";
private _headers: any;
private _errorFlag: boolean;
private _responseType: string;
public onreadystatechange: Function;
constructor() {
this._readyState = this.UNSENT;
}
public open(method: string, url: string, async?: boolean, user?: string, password?: string) {
if (types.isString(method) && types.isString(url)) {
this._options = { url: url, method: method };
this._options.headers = {};
if (types.isString(user)) {
this._options.headers["user"] = user;
}
if (types.isString(password)) {
this._options.headers["password"] = password;
}
this._setReadyState(this.OPENED);
}
}
public abort() {
this._errorFlag = true;
this._response = null;
this._responseText = null;
this._headers = null;
this._status = null;
if (this._readyState === this.UNSENT || this._readyState === this.OPENED || this._readyState === this.DONE) {
this._readyState = this.UNSENT;
} else {
this._setReadyState(this.DONE);
}
}
public send(data?: string) {
this._errorFlag = false;
this._response = null;
this._responseText = null;
this._headers = null;
this._status = null;
if (types.isDefined(this._options)) {
if (types.isString(data)) {
this._options.content = data;
}
httpRequest.request(this._options).then(r=> {
if (!this._errorFlag) {
this._status = r.statusCode;
this._response = r.content.raw;
this._headers = r.headers;
this._setReadyState(this.HEADERS_RECEIVED);
this._setReadyState(this.LOADING);
this._responseText = r.content.toString();
this._setReadyState(this.DONE);
}
}).catch(e => {
this._errorFlag = true;
this._setReadyState(this.DONE);
});
}
}
public setRequestHeader(header: string, value: string) {
if (types.isDefined(this._options) && types.isString(header) && types.isString(value)) {
this._options.headers[header] = value;
}
}
public getAllResponseHeaders(): string {
if (this._readyState < 2 || this._errorFlag) {
return "";
}
var result = "";
for (var i in this._headers) {
// Cookie headers are excluded
if (i !== "set-cookie" && i !== "set-cookie2") {
result += i + ": " + this._headers[i] + "\r\n";
}
}
return result.substr(0, result.length - 2);
}
public getResponseHeader(header: string): string {
if (types.isString(header) && this._readyState > 1
&& this._headers
&& this._headers[header]
&& !this._errorFlag
) {
return this._headers[header];
}
return null;
}
public overrideMimeType(mime: string) {
//
}
get readyState(): number {
return this._readyState;
}
public get responseType(): string {
return this._responseType;
}
public set responseType(value: string) {
if (value === "" || value === "text") {
this._responseType = value;
} else {
throw new Error(`Response type of '${value}' not supported.`);
}
}
private _setReadyState(value: number) {
if (this._readyState !== value) {
this._readyState = value;
if (types.isFunction(this.onreadystatechange)) {
this.onreadystatechange();
}
}
if (this._readyState === this.DONE) {
if (this._errorFlag && types.isFunction(this.onerror)) {
this.onerror();
}
if (!this._errorFlag && types.isFunction(this.onload)) {
this.onload();
}
}
}
get responseText(): string {
return this._responseText;
}
get response(): any {
return this._response;
}
get status(): number {
return this._status;
}
get statusText(): string {
if (this._readyState === this.UNSENT || this._readyState === this.OPENED || this._errorFlag) {
return "";
}
return this._status + " " + statuses[this._status];
}
}
var statuses = {
100: "Continue",
101: "Switching Protocols",
200: "OK",
201: "Created",
202: "Accepted",
203: "Non - Authoritative Information",
204: "No Content",
205: "Reset Content",
206: "Partial Content",
300: "Multiple Choices",
301: "Moved Permanently",
302: "Found",
303: "See Other",
304: "Not Modified",
305: "Use Proxy",
307: "Temporary Redirect",
400: "Bad Request",
401: "Unauthorized",
402: "Payment Required",
403: "Forbidden",
404: "Not Found",
405: "Method Not Allowed",
406: "Not Acceptable",
407: "Proxy Authentication Required",
408: "Request Timeout",
409: "Conflict",
410: "Gone",
411: "Length Required",
412: "Precondition Failed",
413: "Request Entity Too Large",
414: "Request - URI Too Long",
415: "Unsupported Media Type",
416: "Requested Range Not Satisfiable",
417: "Expectation Failed",
500: "Internal Server Error",
501: "Not Implemented",
502: "Bad Gateway",
503: "Service Unavailable",
504: "Gateway Timeout",
505: "HTTP Version Not Supported"
};
}

1
xhr/Readme.md Normal file
View File

@@ -0,0 +1 @@
XMLHttpRequest Level 2: https://xhr.spec.whatwg.org/

2
xhr/package.json Normal file
View File

@@ -0,0 +1,2 @@
{ "name" : "xhr",
"main" : "xhr.js" }

267
xhr/xhr.ts Normal file
View File

@@ -0,0 +1,267 @@
import http = require("http");
import types = require("utils/types");
module XMLHttpRequestResponseType {
export var empty = "";
export var text = "text";
export var json = "json";
}
export class XMLHttpRequest {
public UNSENT = 0;
public OPENED = 1;
public HEADERS_RECEIVED = 2;
public LOADING = 3;
public DONE = 4;
public onload: () => void;
public onerror: () => void;
private _options: http.HttpRequestOptions;
private _readyState: number;
private _status: number;
private _response: any;
private _responseText: Function;
private _headers: any;
private _errorFlag: boolean;
private _responseType: string = "";
public onreadystatechange: Function;
constructor() {
this._readyState = this.UNSENT;
}
public open(method: string, url: string, async?: boolean, user?: string, password?: string) {
if (types.isString(method) && types.isString(url)) {
this._options = { url: url, method: method };
this._options.headers = {};
if (types.isString(user)) {
this._options.headers["user"] = user;
}
if (types.isString(password)) {
this._options.headers["password"] = password;
}
this._setReadyState(this.OPENED);
}
}
public abort() {
this._errorFlag = true;
this._response = null;
this._responseText = null;
this._headers = null;
this._status = null;
if (this._readyState === this.UNSENT || this._readyState === this.OPENED || this._readyState === this.DONE) {
this._readyState = this.UNSENT;
} else {
this._setReadyState(this.DONE);
}
}
public send(data?: any) {
this._errorFlag = false;
this._response = null;
this._responseText = null;
this._headers = null;
this._status = null;
if (types.isDefined(this._options)) {
if (types.isString(data)) {
this._options.content = data;
} else if (data instanceof FormData) {
this._options.content = (<FormData>data).toString();
}
http.request(this._options).then(r=> {
if (!this._errorFlag) {
this._status = r.statusCode;
this._response = r.content.raw;
this._headers = r.headers;
this._setReadyState(this.HEADERS_RECEIVED);
this._setReadyState(this.LOADING);
if (this.responseType === XMLHttpRequestResponseType.empty ||
this.responseType === XMLHttpRequestResponseType.text ||
this.responseType === XMLHttpRequestResponseType.json) {
this._responseText = r.content.toString;
}
this._setReadyState(this.DONE);
}
}).catch(e => {
this._errorFlag = true;
this._setReadyState(this.DONE);
});
}
}
public setRequestHeader(header: string, value: string) {
if (types.isDefined(this._options) && types.isString(header) && types.isString(value)) {
this._options.headers[header] = value;
}
}
public getAllResponseHeaders(): string {
if (this._readyState < 2 || this._errorFlag) {
return "";
}
var result = "";
for (var i in this._headers) {
// Cookie headers are excluded
if (i !== "set-cookie" && i !== "set-cookie2") {
result += i + ": " + this._headers[i] + "\r\n";
}
}
return result.substr(0, result.length - 2);
}
public getResponseHeader(header: string): string {
if (types.isString(header) && this._readyState > 1
&& this._headers
&& this._headers[header]
&& !this._errorFlag
) {
return this._headers[header];
}
return null;
}
public overrideMimeType(mime: string) {
//
}
get readyState(): number {
return this._readyState;
}
public get responseType(): string {
return this._responseType;
}
public set responseType(value: string) {
if (value === XMLHttpRequestResponseType.empty || value in XMLHttpRequestResponseType) {
this._responseType = value;
} else {
throw new Error(`Response type of '${value}' not supported.`);
}
}
private _setReadyState(value: number) {
if (this._readyState !== value) {
this._readyState = value;
if (types.isFunction(this.onreadystatechange)) {
this.onreadystatechange();
}
}
if (this._readyState === this.DONE) {
if (this._errorFlag && types.isFunction(this.onerror)) {
this.onerror();
}
if (!this._errorFlag && types.isFunction(this.onload)) {
this.onload();
}
}
}
get responseText(): string {
if (types.isFunction(this._responseText)) {
return this._responseText();
}
return "";
}
get response(): any {
return this._response;
}
get status(): number {
return this._status;
}
get statusText(): string {
if (this._readyState === this.UNSENT || this._readyState === this.OPENED || this._errorFlag) {
return "";
}
return this._status + " " + statuses[this._status];
}
}
var statuses = {
100: "Continue",
101: "Switching Protocols",
200: "OK",
201: "Created",
202: "Accepted",
203: "Non - Authoritative Information",
204: "No Content",
205: "Reset Content",
206: "Partial Content",
300: "Multiple Choices",
301: "Moved Permanently",
302: "Found",
303: "See Other",
304: "Not Modified",
305: "Use Proxy",
307: "Temporary Redirect",
400: "Bad Request",
401: "Unauthorized",
402: "Payment Required",
403: "Forbidden",
404: "Not Found",
405: "Method Not Allowed",
406: "Not Acceptable",
407: "Proxy Authentication Required",
408: "Request Timeout",
409: "Conflict",
410: "Gone",
411: "Length Required",
412: "Precondition Failed",
413: "Request Entity Too Large",
414: "Request - URI Too Long",
415: "Unsupported Media Type",
416: "Requested Range Not Satisfiable",
417: "Expectation Failed",
500: "Internal Server Error",
501: "Not Implemented",
502: "Bad Gateway",
503: "Service Unavailable",
504: "Gateway Timeout",
505: "HTTP Version Not Supported"
};
export class FormData {
private _data: Map<string, any>;
constructor() {
this._data = new Map<string, any>();
}
append(name: string, value: any) {
this._data.set(name, value);
}
toString(): string {
var arr = new Array<string>();
this._data.forEach(function (value, name, map) {
arr.push(`${encodeURIComponent(name) }=${encodeURIComponent(value) }`);
});
return arr.join("&");
}
}