mirror of
https://github.com/NativeScript/NativeScript.git
synced 2025-11-05 13:26:48 +08:00
mimeTpye set to "application/octet-stream" according to RFC if content-type is not specified. See: http://mattryall.net/blog/2008/03/default-content-type, https://stackoverflow.com/questions/1176022/unknown-file-type-mime
This commit is contained in:
@@ -90,10 +90,10 @@ export namespace NetworkAgent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export function responseReceived(requestId: number, result: org.nativescript.widgets.Async.Http.RequestResult, headers: any) {
|
export function responseReceived(requestId: number, result: org.nativescript.widgets.Async.Http.RequestResult, headers: any) {
|
||||||
let requestIdStr = requestId.toString();
|
const requestIdStr = requestId.toString();
|
||||||
// Content-Type and content-type are both common in headers spelling
|
// Content-Type and content-type are both common in headers spelling
|
||||||
let mimeType: string = <string>headers["Content-Type"] || <string>headers["content-type"];
|
const mimeType: string = <string>headers["Content-Type"] || <string>headers["content-type"] || "application/octet-stream";
|
||||||
let response: NetworkAgent.Response = {
|
const response: NetworkAgent.Response = {
|
||||||
url: result.url || "",
|
url: result.url || "",
|
||||||
status: result.statusCode,
|
status: result.statusCode,
|
||||||
statusText: result.statusText || "",
|
statusText: result.statusText || "",
|
||||||
@@ -102,7 +102,7 @@ export namespace NetworkAgent {
|
|||||||
fromDiskCache: false
|
fromDiskCache: false
|
||||||
}
|
}
|
||||||
|
|
||||||
let responseData: NetworkAgent.ResponseData = {
|
const responseData: NetworkAgent.ResponseData = {
|
||||||
requestId: requestIdStr,
|
requestId: requestIdStr,
|
||||||
type: mimeTypeToType(response.mimeType),
|
type: mimeTypeToType(response.mimeType),
|
||||||
response: response,
|
response: response,
|
||||||
@@ -112,17 +112,17 @@ export namespace NetworkAgent {
|
|||||||
global.__inspector.responseReceived(responseData);
|
global.__inspector.responseReceived(responseData);
|
||||||
global.__inspector.loadingFinished({ requestId: requestIdStr, timestamp: getTimeStamp() });
|
global.__inspector.loadingFinished({ requestId: requestIdStr, timestamp: getTimeStamp() });
|
||||||
|
|
||||||
let hasTextContent = responseData.type === "Document" || responseData.type === "Script";
|
const hasTextContent = responseData.type === "Document" || responseData.type === "Script";
|
||||||
let data;
|
let data;
|
||||||
|
|
||||||
if (!hasTextContent) {
|
if (!hasTextContent) {
|
||||||
if (responseData.type === "Image") {
|
if (responseData.type === "Image") {
|
||||||
let bitmap = result.responseAsImage;
|
const bitmap = result.responseAsImage;
|
||||||
if (bitmap) {
|
if (bitmap) {
|
||||||
let outputStream = new java.io.ByteArrayOutputStream();
|
const outputStream = new java.io.ByteArrayOutputStream();
|
||||||
bitmap.compress(android.graphics.Bitmap.CompressFormat.PNG, 100, outputStream);
|
bitmap.compress(android.graphics.Bitmap.CompressFormat.PNG, 100, outputStream);
|
||||||
|
|
||||||
let base64Image = android.util.Base64.encodeToString(outputStream.toByteArray(), android.util.Base64.DEFAULT);
|
const base64Image = android.util.Base64.encodeToString(outputStream.toByteArray(), android.util.Base64.DEFAULT);
|
||||||
data = base64Image;
|
data = base64Image;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -130,7 +130,7 @@ export namespace NetworkAgent {
|
|||||||
data = result.responseAsString;
|
data = result.responseAsString;
|
||||||
}
|
}
|
||||||
|
|
||||||
let successfulRequestData: NetworkAgent.SuccessfulRequestData = {
|
const successfulRequestData: NetworkAgent.SuccessfulRequestData = {
|
||||||
requestId: requestIdStr,
|
requestId: requestIdStr,
|
||||||
data: data,
|
data: data,
|
||||||
hasTextContent: hasTextContent
|
hasTextContent: hasTextContent
|
||||||
@@ -140,14 +140,14 @@ export namespace NetworkAgent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export function requestWillBeSent(requestId: number, options: any) {
|
export function requestWillBeSent(requestId: number, options: any) {
|
||||||
let request: NetworkAgent.Request = {
|
const request: NetworkAgent.Request = {
|
||||||
url: options.url,
|
url: options.url,
|
||||||
method: options.method,
|
method: options.method,
|
||||||
headers: options.headers || {},
|
headers: options.headers || {},
|
||||||
postData: options.content ? options.content.toString() : ""
|
postData: options.content ? options.content.toString() : ""
|
||||||
}
|
}
|
||||||
|
|
||||||
let requestData: NetworkAgent.RequestData = {
|
const requestData: NetworkAgent.RequestData = {
|
||||||
requestId: requestId.toString(),
|
requestId: requestId.toString(),
|
||||||
url: request.url,
|
url: request.url,
|
||||||
request: request,
|
request: request,
|
||||||
@@ -176,4 +176,4 @@ export namespace NetworkAgent {
|
|||||||
|
|
||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user