@nativescript/canvas-polyfill 1.0.13-v6 → 1.1.0-alpha.0

package/async/http/http.android.js

@@ -1,16 +1,14 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var http_request_common_1 = require("./http-request-common");
-var debugger_1 = require("@nativescript/core/debugger");
-var core_1 = require("@nativescript/core");
-var file_1 = require("../file/file");
-var types_1 = require("@nativescript/core/utils/types");
-var HttpResponseEncoding;
+import { fileNameFromPath, HttpError, isImageUrl, SaveImageStorageKey, TNSHttpSettings } from './http-request-common';
+import { NetworkAgent } from '@nativescript/core/debugger';
+import { File, Folder, knownFolders, path, ApplicationSettings } from '@nativescript/core';
+import { FileManager } from '../file/file';
+import { isString, isObject, isNullOrUndefined } from '@nativescript/core/utils/types';
+export var HttpResponseEncoding;
 (function (HttpResponseEncoding) {
     HttpResponseEncoding[HttpResponseEncoding["UTF8"] = 0] = "UTF8";
     HttpResponseEncoding[HttpResponseEncoding["GBK"] = 1] = "GBK";
-})(HttpResponseEncoding = exports.HttpResponseEncoding || (exports.HttpResponseEncoding = {}));
-var statuses = {
+})(HttpResponseEncoding || (HttpResponseEncoding = {}));
+const statuses = {
     100: 'Continue',
     101: 'Switching Protocols',
     200: 'OK',
@@ -53,22 +51,22 @@ var statuses = {
     505: 'HTTP Version Not Supported'
 };
 function parseJSON(source) {
-    var src = source.trim();
+    const src = source.trim();
     if (src.lastIndexOf(')') === src.length - 1) {
         return JSON.parse(src.substring(src.indexOf('(') + 1, src.lastIndexOf(')')));
     }
     return JSON.parse(src);
 }
-var textTypes = [
+const textTypes = [
     'text/plain',
     'application/xml',
     'application/rss+xml',
     'text/html',
     'text/xml'
 ];
-var isTextContentType = function (contentType) {
-    var result = false;
-    for (var i = 0; i < textTypes.length; i++) {
+const isTextContentType = (contentType) => {
+    let result = false;
+    for (let i = 0; i < textTypes.length; i++) {
         if (contentType.toLowerCase().indexOf(textTypes[i]) >= 0) {
             result = true;
             break;
@@ -76,27 +74,27 @@ var isTextContentType = function (contentType) {
     }
     return result;
 };
-var requestCallbacks = new Map();
-var requestIdCounter = 0;
-var Http = /** @class */ (function () {
-    function Http() {
+const requestCallbacks = new Map();
+let requestIdCounter = 0;
+export class Http {
+    constructor() {
     }
-    Http.buildJavaOptions = function (options) {
-        if (!types_1.isString(options.url)) {
+    static buildJavaOptions(options) {
+        if (!isString(options.url)) {
             throw new Error('Http request must provide a valid url.');
         }
-        var javaOptions = new com.github.triniwiz.async.Async2.Http.RequestOptions();
+        let javaOptions = new com.github.triniwiz.async.Async2.Http.RequestOptions();
         javaOptions.url = options.url;
-        var method;
-        if (types_1.isString(typeof options.method)) {
+        let method;
+        if (isString(typeof options.method)) {
             javaOptions.method = options.method;
             method = options.method.toLowerCase();
         }
         if ((method && method === 'post') || method === 'put') {
-            if (types_1.isString(options.content)) {
+            if (isString(options.content)) {
                 javaOptions.content = new java.lang.String(options.content);
             }
-            else if (types_1.isObject(options.content)) {
+            else if (isObject(options.content)) {
                 javaOptions.content = serialize(options.content);
             }
         }
@@ -104,27 +102,27 @@ var Http = /** @class */ (function () {
             javaOptions.timeout = options.timeout;
         }
         if (options.headers) {
-            var arrayList_1 = new java.util.ArrayList();
-            var pair_1 = com.github.triniwiz.async.Async2.Http.KeyValuePair;
+            const arrayList = new java.util.ArrayList();
+            const pair = com.github.triniwiz.async.Async2.Http.KeyValuePair;
             if (options.headers instanceof Map) {
-                options.headers.forEach(function (value, key) {
-                    arrayList_1.add(new pair_1(key, value + ''));
+                options.headers.forEach((value, key) => {
+                    arrayList.add(new pair(key, value + ''));
                 });
             }
             else {
-                for (var key in options.headers) {
-                    arrayList_1.add(new pair_1(key, options.headers[key] + ''));
+                for (let key in options.headers) {
+                    arrayList.add(new pair(key, options.headers[key] + ''));
                 }
             }
-            javaOptions.headers = arrayList_1;
+            javaOptions.headers = arrayList;
         }
         return javaOptions;
-    };
-    Http.buildJavaDownloadOptions = function (options) {
-        if (!types_1.isString(options.url)) {
+    }
+    static buildJavaDownloadOptions(options) {
+        if (!isString(options.url)) {
             throw new Error('Http request must provide a valid url.');
         }
-        var javaOptions = new com.github.triniwiz.async.Async2.Http.DownloadRequestOptions();
+        const javaOptions = new com.github.triniwiz.async.Async2.Http.DownloadRequestOptions();
         javaOptions.url = options.url;
         if (typeof options.timeout === 'number') {
             javaOptions.timeout = options.timeout;
@@ -134,54 +132,54 @@ var Http = /** @class */ (function () {
         }
         else {
             // creates directory
-            core_1.Folder.fromPath(core_1.path.join(core_1.knownFolders.temp().path, 'async_http'));
-            javaOptions.filePath = core_1.path.join(core_1.knownFolders.temp().path, 'async_http', java.util.UUID.randomUUID().toString());
+            Folder.fromPath(path.join(knownFolders.temp().path, 'async_http'));
+            javaOptions.filePath = path.join(knownFolders.temp().path, 'async_http', java.util.UUID.randomUUID().toString());
         }
         if (options.headers) {
-            var arrayList_2 = new java.util.ArrayList();
-            var pair_2 = com.github.triniwiz.async.Async2.Http.KeyValuePair;
+            const arrayList = new java.util.ArrayList();
+            const pair = com.github.triniwiz.async.Async2.Http.KeyValuePair;
             if (options.headers instanceof Map) {
-                options.headers.forEach(function (value, key) {
-                    arrayList_2.add(new pair_2(key, value + ''));
+                options.headers.forEach((value, key) => {
+                    arrayList.add(new pair(key, value + ''));
                 });
             }
             else {
-                for (var key in options.headers) {
-                    arrayList_2.add(new pair_2(key, options.headers[key] + ''));
+                for (let key in options.headers) {
+                    arrayList.add(new pair(key, options.headers[key] + ''));
                 }
             }
-            javaOptions.headers = arrayList_2;
+            javaOptions.headers = arrayList;
         }
         return javaOptions;
-    };
-    Http.prototype.request = function (options) {
-        var headers = {};
-        var statusCode = 0;
-        var id;
-        var counter = requestIdCounter;
-        var request = new Promise(function (resolve, reject) {
+    }
+    request(options) {
+        const headers = {};
+        let statusCode = 0;
+        let id;
+        const counter = requestIdCounter;
+        const request = new Promise((resolve, reject) => {
             try {
                 // initialize the options
-                var javaOptions_1 = Http.buildJavaOptions(options);
-                if (http_request_common_1.TNSHttpSettings.debug) {
+                const javaOptions = Http.buildJavaOptions(options);
+                if (TNSHttpSettings.debug) {
                     // @ts-ignore
                     if (global.__inspector && global.__inspector.isConnected) {
-                        debugger_1.NetworkAgent.requestWillBeSent(requestIdCounter, options);
+                        NetworkAgent.requestWillBeSent(requestIdCounter, options);
                     }
                 }
-                var makeRemoteRequest = function () {
-                    var callback = new com.github.triniwiz.async.Async2.Http.Callback({
-                        onCancel: function (param) {
+                const makeRemoteRequest = () => {
+                    const callback = new com.github.triniwiz.async.Async2.Http.Callback({
+                        onCancel(param) {
                             reject({
-                                type: http_request_common_1.HttpError.Cancelled,
+                                type: HttpError.Cancelled,
                                 result: param
                             });
                             requestCallbacks.delete(id);
                         },
-                        onComplete: function (result) {
-                            var content;
-                            var responseText;
-                            var _isString = false;
+                        onComplete(result) {
+                            let content;
+                            let responseText;
+                            let _isString = false;
                             if (result.content instanceof org.json.JSONObject || result.content instanceof org.json.JSONArray) {
                                 content = deserialize(result.content);
                                 responseText = result.contentText;
@@ -192,36 +190,35 @@ var Http = /** @class */ (function () {
                                 responseText = result.contentText;
                             }
                             if (result && result.headers) {
-                                var length_1 = result.headers.size();
-                                var pair = void 0;
-                                for (var i = 0; i < length_1; i++) {
+                                const length = result.headers.size();
+                                let pair;
+                                for (let i = 0; i < length; i++) {
                                     pair = result.headers.get(i);
                                     addHeader(headers, pair.key, pair.value);
                                 }
                             }
                             // send response data (for requestId) to network debugger
-                            var contentType = headers['Content-Type'];
-                            if (types_1.isNullOrUndefined(contentType)) {
+                            let contentType = headers['Content-Type'];
+                            if (isNullOrUndefined(contentType)) {
                                 contentType = headers['content-type'];
                             }
-                            var acceptHeader;
-                            if (types_1.isNullOrUndefined(contentType)) {
+                            let acceptHeader;
+                            if (isNullOrUndefined(contentType)) {
                                 acceptHeader = headers['Accept'];
-                                if (types_1.isNullOrUndefined(acceptHeader)) {
+                                if (isNullOrUndefined(acceptHeader)) {
                                     acceptHeader = headers['accept'];
                                 }
                             }
                             else {
                                 acceptHeader = contentType;
                             }
-                            var returnType = 'text/plain';
-                            if (!types_1.isNullOrUndefined(acceptHeader) && types_1.isString(acceptHeader)) {
-                                var acceptValues = acceptHeader.split(',');
-                                var quality = [];
-                                var defaultQuality = [];
-                                var customQuality = [];
-                                for (var _i = 0, acceptValues_1 = acceptValues; _i < acceptValues_1.length; _i++) {
-                                    var value = acceptValues_1[_i];
+                            let returnType = 'text/plain';
+                            if (!isNullOrUndefined(acceptHeader) && isString(acceptHeader)) {
+                                let acceptValues = acceptHeader.split(',');
+                                let quality = [];
+                                let defaultQuality = [];
+                                let customQuality = [];
+                                for (let value of acceptValues) {
                                     if (value.indexOf(';q=') > -1) {
                                         customQuality.push(value);
                                     }
@@ -229,37 +226,37 @@ var Http = /** @class */ (function () {
                                         defaultQuality.push(value);
                                     }
                                 }
-                                customQuality = customQuality.sort(function (a, b) {
-                                    var a_quality = parseFloat(a.substring(a.indexOf(';q=')).replace(';q=', ''));
-                                    var b_quality = parseFloat(b.substring(b.indexOf(';q=')).replace(';q=', ''));
+                                customQuality = customQuality.sort((a, b) => {
+                                    const a_quality = parseFloat(a.substring(a.indexOf(';q=')).replace(';q=', ''));
+                                    const b_quality = parseFloat(b.substring(b.indexOf(';q=')).replace(';q=', ''));
                                     return (b_quality - a_quality);
                                 });
-                                quality.push.apply(quality, defaultQuality);
-                                quality.push.apply(quality, customQuality);
+                                quality.push(...defaultQuality);
+                                quality.push(...customQuality);
                                 returnType = quality[0];
                             }
                             result['statusCode'] = statusCode;
-                            if (http_request_common_1.TNSHttpSettings.debug) {
+                            if (TNSHttpSettings.debug) {
                                 // send response data (for requestId) to network debugger
                                 // @ts-ignore
                                 if (global.__inspector && global.__inspector.isConnected) {
-                                    debugger_1.NetworkAgent.responseReceived(counter, {
+                                    NetworkAgent.responseReceived(counter, {
                                         url: result.url,
-                                        statusCode: statusCode,
-                                        headers: headers,
-                                        responseAsString: types_1.isString ? (result.contentText ? result.contentText : result.content.toString()) : null,
+                                        statusCode,
+                                        headers,
+                                        responseAsString: isString ? (result.contentText ? result.contentText : result.content.toString()) : null,
                                         responseAsImage: null // TODO needs base64 Image
                                     }, headers);
                                 }
                             }
-                            if (isTextContentType(returnType) && types_1.isNullOrUndefined(responseText)) {
+                            if (isTextContentType(returnType) && isNullOrUndefined(responseText)) {
                                 responseText = result.contentText;
                             }
-                            if (http_request_common_1.TNSHttpSettings.saveImage && http_request_common_1.TNSHttpSettings.currentlySavedImages && http_request_common_1.TNSHttpSettings.currentlySavedImages[this._url]) {
+                            if (TNSHttpSettings.saveImage && TNSHttpSettings.currentlySavedImages && TNSHttpSettings.currentlySavedImages[this._url]) {
                                 // ensure saved to disk
-                                if (http_request_common_1.TNSHttpSettings.currentlySavedImages[this._url].localPath) {
-                                    file_1.FileManager.writeFile(content, http_request_common_1.TNSHttpSettings.currentlySavedImages[this._url].localPath, function (error, result) {
-                                        if (http_request_common_1.TNSHttpSettings.debug) {
+                                if (TNSHttpSettings.currentlySavedImages[this._url].localPath) {
+                                    FileManager.writeFile(content, TNSHttpSettings.currentlySavedImages[this._url].localPath, function (error, result) {
+                                        if (TNSHttpSettings.debug) {
                                             console.log('http image save:', error ? error : result);
                                         }
                                     });
@@ -267,25 +264,25 @@ var Http = /** @class */ (function () {
                             }
                             resolve({
                                 url: result.url,
-                                content: content,
-                                responseText: responseText,
+                                content,
+                                responseText,
                                 statusCode: statusCode,
                                 headers: headers
                             });
                             requestCallbacks.delete(id);
                         },
-                        onError: function (param0, param1) {
+                        onError(param0, param1) {
                             reject({
-                                type: http_request_common_1.HttpError.Error,
+                                type: HttpError.Error,
                                 message: param0
                             });
                             requestCallbacks.delete(id);
                         },
-                        onHeaders: function (jHeaders, status) {
+                        onHeaders(jHeaders, status) {
                             statusCode = status;
-                            var length = jHeaders.size();
-                            var pair;
-                            for (var i = 0; i < length; i++) {
+                            const length = jHeaders.size();
+                            let pair;
+                            for (let i = 0; i < length; i++) {
                                 pair = jHeaders.get(i);
                                 addHeader(headers, pair.key, pair.value);
                             }
@@ -293,53 +290,53 @@ var Http = /** @class */ (function () {
                                 options.onHeaders(headers, statusCode);
                             }
                             requestCallbacks.delete(id);
-                        }, onLoading: function () {
+                        }, onLoading() {
                             options.onLoading();
                             requestCallbacks.delete(id);
-                        }, onProgress: function (lengthComputable, loaded, total) {
+                        }, onProgress(lengthComputable, loaded, total) {
                             if (options.onProgress) {
                                 options.onProgress({
-                                    lengthComputable: lengthComputable,
-                                    loaded: loaded,
-                                    total: total
+                                    lengthComputable,
+                                    loaded,
+                                    total
                                 });
                             }
                             requestCallbacks.delete(id);
                         },
-                        onTimeout: function () {
+                        onTimeout() {
                             reject({
-                                type: http_request_common_1.HttpError.Timeout
+                                type: HttpError.Timeout
                             });
                             requestCallbacks.delete(id);
                         }
                     });
-                    id = com.github.triniwiz.async.Async2.Http.makeRequest(javaOptions_1, callback);
+                    id = com.github.triniwiz.async.Async2.Http.makeRequest(javaOptions, callback);
                     requestCallbacks.set(id, callback);
                 };
-                if (http_request_common_1.TNSHttpSettings.saveImage && http_request_common_1.isImageUrl(options.url)) {
+                if (TNSHttpSettings.saveImage && isImageUrl(options.url)) {
                     // handle saved images to disk
-                    if (!http_request_common_1.TNSHttpSettings.currentlySavedImages) {
-                        var stored = core_1.ApplicationSettings.getString(http_request_common_1.SaveImageStorageKey);
+                    if (!TNSHttpSettings.currentlySavedImages) {
+                        const stored = ApplicationSettings.getString(SaveImageStorageKey);
                         if (stored) {
                             try {
-                                http_request_common_1.TNSHttpSettings.currentlySavedImages = JSON.parse(stored);
+                                TNSHttpSettings.currentlySavedImages = JSON.parse(stored);
                             }
                             catch (err) {
-                                http_request_common_1.TNSHttpSettings.currentlySavedImages = {};
+                                TNSHttpSettings.currentlySavedImages = {};
                             }
                         }
                         else {
-                            http_request_common_1.TNSHttpSettings.currentlySavedImages = {};
+                            TNSHttpSettings.currentlySavedImages = {};
                         }
                     }
-                    var imageSetting = http_request_common_1.TNSHttpSettings.currentlySavedImages[options.url];
-                    var requests = imageSetting ? imageSetting.requests : 0;
-                    var localPath = void 0;
-                    if (imageSetting && imageSetting.localPath && core_1.File.exists(imageSetting.localPath)) {
+                    const imageSetting = TNSHttpSettings.currentlySavedImages[options.url];
+                    const requests = imageSetting ? imageSetting.requests : 0;
+                    let localPath;
+                    if (imageSetting && imageSetting.localPath && File.exists(imageSetting.localPath)) {
                         // previously saved to disk
-                        file_1.FileManager.readFile(imageSetting.localPath, null, function (error, file) {
+                        FileManager.readFile(imageSetting.localPath, null, (error, file) => {
                             if (error) {
-                                if (http_request_common_1.TNSHttpSettings.debug) {
+                                if (TNSHttpSettings.debug) {
                                     console.log('http image load error:', error);
                                 }
                             }
@@ -354,19 +351,19 @@ var Http = /** @class */ (function () {
                             });
                         });
                     }
-                    else if (requests >= http_request_common_1.TNSHttpSettings.saveImage.numberOfRequests) {
+                    else if (requests >= TNSHttpSettings.saveImage.numberOfRequests) {
                         // setup to write to disk when response finishes
-                        var filename = http_request_common_1.fileNameFromPath(options.url);
+                        let filename = fileNameFromPath(options.url);
                         if (filename.indexOf('?')) {
                             // strip any params if were any
                             filename = filename.split('?')[0];
                         }
-                        localPath = core_1.path.join(core_1.knownFolders.documents().path, filename);
+                        localPath = path.join(knownFolders.documents().path, filename);
                         makeRemoteRequest();
                     }
                     // save settings
-                    http_request_common_1.TNSHttpSettings.currentlySavedImages[options.url] = __assign({}, (imageSetting || {}), { date: Date.now(), requests: requests + 1, localPath: localPath });
-                    core_1.ApplicationSettings.setString(http_request_common_1.SaveImageStorageKey, JSON.stringify(http_request_common_1.TNSHttpSettings.currentlySavedImages));
+                    TNSHttpSettings.currentlySavedImages[options.url] = Object.assign(Object.assign({}, (imageSetting || {})), { date: Date.now(), requests: requests + 1, localPath });
+                    ApplicationSettings.setString(SaveImageStorageKey, JSON.stringify(TNSHttpSettings.currentlySavedImages));
                 }
                 else {
                     makeRemoteRequest();
@@ -375,7 +372,7 @@ var Http = /** @class */ (function () {
             }
             catch (ex) {
                 reject({
-                    type: http_request_common_1.HttpError.Error,
+                    type: HttpError.Error,
                     message: ex.message
                 });
             }
@@ -384,63 +381,62 @@ var Http = /** @class */ (function () {
             com.github.triniwiz.async.Async2.Http.cancelRequest(id);
         };
         return request;
-    };
-    Http.getFile = function (options) {
-        var headers = {};
-        var statusCode = 0;
-        var id;
-        var counter = requestIdCounter;
-        var request = new Promise(function (resolve, reject) {
+    }
+    static getFile(options) {
+        const headers = {};
+        let statusCode = 0;
+        let id;
+        const counter = requestIdCounter;
+        const request = new Promise((resolve, reject) => {
             try {
                 // initialize the options
-                var javaOptions_2 = Http.buildJavaDownloadOptions(options);
-                if (http_request_common_1.TNSHttpSettings.debug) {
+                const javaOptions = Http.buildJavaDownloadOptions(options);
+                if (TNSHttpSettings.debug) {
                     // @ts-ignore
                     if (global.__inspector && global.__inspector.isConnected) {
-                        debugger_1.NetworkAgent.requestWillBeSent(requestIdCounter, options);
+                        NetworkAgent.requestWillBeSent(requestIdCounter, options);
                     }
                 }
-                var makeRemoteRequest = function () {
-                    var callback = new com.github.triniwiz.async.Async2.Http.Callback({
-                        onCancel: function (param) {
+                const makeRemoteRequest = () => {
+                    const callback = new com.github.triniwiz.async.Async2.Http.Callback({
+                        onCancel(param) {
                             reject({
-                                type: http_request_common_1.HttpError.Cancelled,
+                                type: HttpError.Cancelled,
                                 result: param
                             });
                             requestCallbacks.delete(id);
                         },
-                        onComplete: function (result) {
+                        onComplete(result) {
                             if (result && result.headers) {
-                                var length_2 = result.headers.size();
-                                var pair = void 0;
-                                for (var i = 0; i < length_2; i++) {
+                                const length = result.headers.size();
+                                let pair;
+                                for (let i = 0; i < length; i++) {
                                     pair = result.headers.get(i);
                                     addHeader(headers, pair.key, pair.value);
                                 }
                             }
                             // send response data (for requestId) to network debugger
-                            var contentType = headers['Content-Type'];
-                            if (types_1.isNullOrUndefined(contentType)) {
+                            let contentType = headers['Content-Type'];
+                            if (isNullOrUndefined(contentType)) {
                                 contentType = headers['content-type'];
                             }
-                            var acceptHeader;
-                            if (types_1.isNullOrUndefined(contentType)) {
+                            let acceptHeader;
+                            if (isNullOrUndefined(contentType)) {
                                 acceptHeader = headers['Accept'];
-                                if (types_1.isNullOrUndefined(acceptHeader)) {
+                                if (isNullOrUndefined(acceptHeader)) {
                                     acceptHeader = headers['accept'];
                                 }
                             }
                             else {
                                 acceptHeader = contentType;
                             }
-                            var returnType = 'text/plain';
-                            if (!types_1.isNullOrUndefined(acceptHeader) && types_1.isString(acceptHeader)) {
-                                var acceptValues = acceptHeader.split(',');
-                                var quality = [];
-                                var defaultQuality = [];
-                                var customQuality = [];
-                                for (var _i = 0, acceptValues_2 = acceptValues; _i < acceptValues_2.length; _i++) {
-                                    var value = acceptValues_2[_i];
+                            let returnType = 'text/plain';
+                            if (!isNullOrUndefined(acceptHeader) && isString(acceptHeader)) {
+                                let acceptValues = acceptHeader.split(',');
+                                let quality = [];
+                                let defaultQuality = [];
+                                let customQuality = [];
+                                for (let value of acceptValues) {
                                     if (value.indexOf(';q=') > -1) {
                                         customQuality.push(value);
                                     }
@@ -448,25 +444,25 @@ var Http = /** @class */ (function () {
                                         defaultQuality.push(value);
                                     }
                                 }
-                                customQuality = customQuality.sort(function (a, b) {
-                                    var a_quality = parseFloat(a.substring(a.indexOf(';q=')).replace(';q=', ''));
-                                    var b_quality = parseFloat(b.substring(b.indexOf(';q=')).replace(';q=', ''));
+                                customQuality = customQuality.sort((a, b) => {
+                                    const a_quality = parseFloat(a.substring(a.indexOf(';q=')).replace(';q=', ''));
+                                    const b_quality = parseFloat(b.substring(b.indexOf(';q=')).replace(';q=', ''));
                                     return (b_quality - a_quality);
                                 });
-                                quality.push.apply(quality, defaultQuality);
-                                quality.push.apply(quality, customQuality);
+                                quality.push(...defaultQuality);
+                                quality.push(...customQuality);
                                 returnType = quality[0];
                             }
                             result['statusCode'] = statusCode;
-                            if (http_request_common_1.TNSHttpSettings.debug) {
+                            if (TNSHttpSettings.debug) {
                                 // send response data (for requestId) to network debugger
                                 // @ts-ignore
                                 if (global.__inspector && global.__inspector.isConnected) {
-                                    debugger_1.NetworkAgent.responseReceived(counter, {
+                                    NetworkAgent.responseReceived(counter, {
                                         url: result.url,
-                                        statusCode: statusCode,
-                                        headers: headers,
-                                        responseAsString: types_1.isString ? (result.contentText ? result.contentText : result.content.toString()) : null,
+                                        statusCode,
+                                        headers,
+                                        responseAsString: isString ? (result.contentText ? result.contentText : result.content.toString()) : null,
                                         responseAsImage: null // TODO needs base64 Image
                                     }, headers);
                                 }
@@ -474,18 +470,18 @@ var Http = /** @class */ (function () {
                             resolve(result.filePath);
                             requestCallbacks.delete(id);
                         },
-                        onError: function (param0, param1) {
+                        onError(param0, param1) {
                             reject({
-                                type: http_request_common_1.HttpError.Error,
+                                type: HttpError.Error,
                                 message: param0
                             });
                             requestCallbacks.delete(id);
                         },
-                        onHeaders: function (jHeaders, status) {
+                        onHeaders(jHeaders, status) {
                             statusCode = status;
-                            var length = jHeaders.size();
-                            var pair;
-                            for (var i = 0; i < length; i++) {
+                            const length = jHeaders.size();
+                            let pair;
+                            for (let i = 0; i < length; i++) {
                                 pair = jHeaders.get(i);
                                 addHeader(headers, pair.key, pair.value);
                             }
@@ -493,27 +489,27 @@ var Http = /** @class */ (function () {
                                 options.onHeaders(headers, statusCode);
                             }
                             requestCallbacks.delete(id);
-                        }, onLoading: function () {
+                        }, onLoading() {
                             options.onLoading();
                             requestCallbacks.delete(id);
-                        }, onProgress: function (lengthComputable, loaded, total) {
+                        }, onProgress(lengthComputable, loaded, total) {
                             if (options.onProgress) {
                                 options.onProgress({
-                                    lengthComputable: lengthComputable,
-                                    loaded: loaded,
-                                    total: total
+                                    lengthComputable,
+                                    loaded,
+                                    total
                                 });
                             }
                             requestCallbacks.delete(id);
                         },
-                        onTimeout: function () {
+                        onTimeout() {
                             reject({
-                                type: http_request_common_1.HttpError.Timeout
+                                type: HttpError.Timeout
                             });
                             requestCallbacks.delete(id);
                         }
                     });
-                    id = com.github.triniwiz.async.Async2.Http.getFileRequest(javaOptions_2, callback);
+                    id = com.github.triniwiz.async.Async2.Http.getFileRequest(javaOptions, callback);
                     requestCallbacks.set(id, callback);
                 };
                 makeRemoteRequest();
@@ -521,7 +517,7 @@ var Http = /** @class */ (function () {
             }
             catch (ex) {
                 reject({
-                    type: http_request_common_1.HttpError.Error,
+                    type: HttpError.Error,
                     message: ex.message
                 });
             }
@@ -530,12 +526,10 @@ var Http = /** @class */ (function () {
             com.github.triniwiz.async.Async2.Http.cancelRequest(id);
         };
         return request;
-    };
-    return Http;
-}());
-exports.Http = Http;
+    }
+}
 function serialize(data) {
-    var store;
+    let store;
     switch (typeof data) {
         case 'string':
         case 'boolean':
@@ -551,11 +545,11 @@ function serialize(data) {
             }
             if (Array.isArray(data)) {
                 store = new org.json.JSONArray();
-                data.forEach(function (item) { return store.put(serialize(item)); });
+                data.forEach((item) => store.put(serialize(item)));
                 return store;
             }
             store = new org.json.JSONObject();
-            Object.keys(data).forEach(function (key) { return store.put(key, serialize(data[key])); });
+            Object.keys(data).forEach((key) => store.put(key, serialize(data[key])));
             return store;
         }
         default:
@@ -563,14 +557,14 @@ function serialize(data) {
     }
 }
 function deserialize(data) {
-    if (types_1.isNullOrUndefined(data)) {
+    if (isNullOrUndefined(data)) {
         return null;
     }
     if (typeof data !== 'object') {
         return data;
     }
     if (typeof data.getClass === 'function') {
-        var store = void 0;
+        let store;
         switch (data.getClass().getName()) {
             case 'java.lang.String': {
                 return String(data);
@@ -586,16 +580,16 @@ function deserialize(data) {
             }
             case 'org.json.JSONArray': {
                 store = [];
-                for (var j = 0; j < data.length(); j++) {
+                for (let j = 0; j < data.length(); j++) {
                     store[j] = deserialize(data.get(j));
                 }
                 break;
             }
             case 'org.json.JSONObject': {
                 store = {};
-                var i = data.keys();
+                let i = data.keys();
                 while (i.hasNext()) {
-                    var key = i.next();
+                    let key = i.next();
                     store[key] = deserialize(data.get(key));
                 }
                 break;
@@ -611,13 +605,13 @@ function deserialize(data) {
     }
 }
 function decodeResponse(raw, encoding) {
-    var charsetName = 'UTF-8';
+    let charsetName = 'UTF-8';
     if (encoding === HttpResponseEncoding.GBK) {
         charsetName = 'GBK';
     }
     return new java.lang.String(raw.array(), charsetName);
 }
-function addHeader(headers, key, value) {
+export function addHeader(headers, key, value) {
     if (!headers[key]) {
         headers[key] = value;
     }
@@ -625,10 +619,9 @@ function addHeader(headers, key, value) {
         headers[key].push(value);
     }
     else {
-        var values = [headers[key]];
+        const values = [headers[key]];
         values.push(value);
         headers[key] = values;
     }
 }
-exports.addHeader = addHeader;
 //# sourceMappingURL=http.android.js.map