chore: cleanup and improvements

Author: farfromrefug

src/https/request.android.ts

@@ -108,17 +108,16 @@ class HttpsResponseLegacy implements IHttpsResponseLegacy {
             return null;
         }
     }
-    toArrayBufferAsync(): Promise<ArrayBuffer> {
+    async toArrayBufferAsync() {
         if (this.arrayBuffer) {
             return Promise.resolve(this.arrayBuffer);
         }
-        return new Promise((resolve, reject) => {
+        const r = await new Promise<ArrayBuffer>((resolve, reject) => {
             this.getOrCreateCloseCallback();
             this.response.toByteArrayAsync(this.getCallback(resolve, reject));
-        }).then((r: ArrayBuffer) => {
-            this.arrayBuffer = r;
-            return this.arrayBuffer;
         });
+        this.arrayBuffer = r;
+        return r;
     }
 
     // cache it because asking it again wont work as the socket is closed
@@ -152,7 +151,7 @@ class HttpsResponseLegacy implements IHttpsResponseLegacy {
         return this.jsonResponse;
     }
 
-    async toJSONAsync() {
+    async toJSONAsync<T>() {
         if (this.jsonResponse !== undefined) {
             return this.jsonResponse;
         }
@@ -163,7 +162,7 @@ class HttpsResponseLegacy implements IHttpsResponseLegacy {
         // TODO: handle arraybuffer already stored
         const r = await this.toStringAsync();
         this.jsonResponse = r ? parseJSON(r) : null;
-        return this.jsonResponse;
+        return this.jsonResponse as T;
     }
 
     // cache it because asking it again wont work as the socket is closed
@@ -172,13 +171,12 @@ class HttpsResponseLegacy implements IHttpsResponseLegacy {
         if (this.imageSource) {
             return this.imageSource;
         }
-        return new Promise<ImageSource>((resolve, reject) => {
+        const r = await new Promise<ImageSource>((resolve, reject) => {
             this.getOrCreateCloseCallback();
-            this.response.toImageAsync(this.getCallback(resolve, reject)).then((r) => {
-                this.imageSource = r;
-                return r;
-            });
+            this.response.toImageAsync(this.getCallback(resolve, reject));
         });
+        this.imageSource = r;
+        return r;
     }
     // toFile(destinationFilePath: string): File {
     //     if (!destinationFilePath) {

src/https/request.ios.ts

@@ -149,7 +149,7 @@ class HttpsResponseLegacy implements IHttpsResponseLegacy {
         return Promise.resolve(this.toString(encoding));
     }
     jsonResponse: any;
-    toJSON(encoding?: any) {
+    toJSON<T>(encoding?: any) {
         if (!this.data) {
             return null;
         }
@@ -165,48 +165,43 @@ class HttpsResponseLegacy implements IHttpsResponseLegacy {
             this.jsonResponse = data;
             return data;
         }
-        try {
-            this.stringResponse = data;
-            this.jsonResponse = parseJSON(data);
-            return this.jsonResponse;
-        } catch (err) {
-            console.error('HttpsResponse.toJSON', err);
-            return null;
-        }
+        this.stringResponse = data;
+        this.jsonResponse = parseJSON(data);
+        return this.jsonResponse as T;
+       
     }
-    toJSONAsync(): Promise<any> {
-        return Promise.resolve(this.toJSON());
+    toJSONAsync<T>() {
+        return Promise.resolve<T>(this.toJSON());
     }
     imageSource: ImageSource;
-    toImage(): Promise<ImageSource> {
+    async toImage(): Promise<ImageSource> {
         if (!this.data) {
             return Promise.resolve(null);
         }
         if (this.imageSource) {
             return Promise.resolve(this.imageSource);
         }
-        return new Promise<ImageSource>((resolve, reject) => {
+        const r = await new Promise<ImageSource>((resolve, reject) => {
             (UIImage as any).tns_decodeImageWithDataCompletion(this.data, (image) => {
                 if (image) {
                     resolve(new ImageSource(image));
                 } else {
                     reject(new Error('Response content may not be converted to an Image'));
                 }
             });
-        }).then((r) => {
-            this.imageSource = r;
-            return r;
         });
+        this.imageSource = r;
+        return r;
     }
     file: File;
-    toFile(destinationFilePath?: string): Promise<File> {
+    async toFile(destinationFilePath?: string): Promise<File> {
         if (!this.data) {
             return Promise.resolve(null);
         }
         if (this.file) {
             return Promise.resolve(this.file);
         }
-        return new Promise<File>((resolve, reject) => {
+        const r = await new Promise<File>((resolve, reject) => {
             if (!destinationFilePath) {
                 destinationFilePath = getFilenameFromUrl(this.url);
             }
@@ -215,24 +210,23 @@ class HttpsResponseLegacy implements IHttpsResponseLegacy {
                 const file = File.fromPath(destinationFilePath);
 
                 const result = this.data.writeToFileAtomically(destinationFilePath, true);
-                if (resolve) {
+                if (result) {
                     resolve(file);
                 } else {
                     reject(new Error(`Cannot save file with path: ${destinationFilePath}.`));
                 }
             } else {
                 reject(new Error(`Cannot save file with path: ${destinationFilePath}.`));
             }
-        }).then((f) => {
-            this.file = f;
-            return f;
-        });
+        })
+        this.file = r;
+        return r;
     }
 }
 
 function AFFailure(resolve, reject, task: NSURLSessionDataTask, error: NSError, useLegacy: boolean, url) {
     if (error.code === -999) {
-        return reject(new Error(error.localizedDescription));
+        return reject(error);
     }
     let getHeaders = () => ({});
     const sendi = {
@@ -265,6 +259,7 @@ function AFFailure(resolve, reject, task: NSURLSessionDataTask, error: NSError,
             return reject(error.localizedDescription);
         }
         const failure: any = {
+            error,
             description: error.description,
             reason: error.localizedDescription,
             url: failingURL ? failingURL.description : url
@@ -277,6 +272,7 @@ function AFFailure(resolve, reject, task: NSURLSessionDataTask, error: NSError,
         resolve(sendi);
     } else {
         const response: any = {
+            error,
             body: parsedData,
             contentLength: sendi.contentLength,
             description: error.description,