feat: contentLength

Author: farfromrefug

src/request.android.ts

@@ -1,5 +1,5 @@
 import { File, HttpResponseEncoding, ImageSource, Utils } from '@nativescript/core';
-import { CacheOptions, HttpsFormDataParam, HttpsRequest, HttpsRequestOptions, HttpsResponseLegacy, HttpsSSLPinningOptions } from '.';
+import { CacheOptions, HttpsFormDataParam, HttpsRequest, HttpsRequestOptions, HttpsSSLPinningOptions, HttpsResponseLegacy as IHttpsResponseLegacy } from '.';
 
 import { getFilenameFromUrl, interceptors, networkInterceptors, parseJSON } from './request.common';
 export { addNetworkInterceptor, addInterceptor } from './request.common';
@@ -41,10 +41,13 @@ export function clearCache() {
 
 let _timeout = 10;
 
-class HttpsResponseLegacyIOS implements HttpsResponseLegacy {
+class HttpsResponseLegacy implements IHttpsResponseLegacy {
     private callback?: com.nativescript.https.OkHttpResponse.OkHttpResponseAsyncCallback;
     constructor(private response: com.nativescript.https.OkHttpResponse, private tag: string, private url: string) {}
 
+    get contentLength() {
+        return this.response.contentLength();
+    }
     getOrCreateCloseCallback() {
         if (!notClosedResponses[this.tag]) {
             // we need to store handling request to be able to cancel them
@@ -440,7 +443,11 @@ export function createRequest(opts: HttpsRequestOptions, useLegacy: boolean = tr
                     const MEDIA_TYPE = okhttp3.MediaType.parse(param.contentType);
                     builder.addFormDataPart(param.parameterName, param.fileName, okhttp3.RequestBody.create(MEDIA_TYPE, param.data));
                 } else {
-                    builder.addFormDataPart(param.parameterName, param.data);
+                    if (typeof param.data === 'string') {
+                        builder.addFormDataPart(param.parameterName, param.data);
+                    } else {
+                        builder.addFormDataPart(param.parameterName, param.data + '');
+                    }
                 }
             });
             okHttpBody = builder.build();
@@ -520,7 +527,8 @@ export function createRequest(opts: HttpsRequestOptions, useLegacy: boolean = tr
 
                             resolve({
                                 response,
-                                content: new HttpsResponseLegacyIOS(nResponse, tag, opts.url),
+                                content: new HttpsResponseLegacy(nResponse, tag, opts.url),
+                                contentLength: nResponse.contentLength(),
                                 statusCode,
                                 reason: message,
                                 get headers() {
@@ -531,6 +539,7 @@ export function createRequest(opts: HttpsRequestOptions, useLegacy: boolean = tr
                             resolve({
                                 response,
                                 content: responseBody.string(),
+                                contentLength: responseBody.contentLength(),
                                 reason: message,
                                 statusCode,
                                 get headers() {

src/request.d.ts

@@ -62,6 +62,7 @@ export interface HttpsRequestOptions extends HttpRequestOptions {
 export interface HttpsResponse<T = any> {
     headers?: Headers;
     statusCode?: number;
+    contentLength: number;
     content?: T;
     reason?: string;
     description?: string;
@@ -76,6 +77,7 @@ export interface HttpsRequest {
 }
 
 export interface HttpsResponseLegacy<T = any> {
+    contentLength: number;
     toArrayBuffer(): ArrayBuffer;
     toArrayBufferAsync(): Promise<ArrayBuffer>;
 

src/request.ios.ts

@@ -1,5 +1,5 @@
 import { File, ImageSource, Utils } from '@nativescript/core';
-import { CacheOptions, HttpsFormDataParam, HttpsRequest, HttpsRequestOptions, HttpsResponse, HttpsResponseLegacy, HttpsSSLPinningOptions } from '.';
+import { CacheOptions, HttpsFormDataParam, HttpsRequest, HttpsRequestOptions, HttpsResponse, HttpsSSLPinningOptions, HttpsResponseLegacy as IHttpsResponseLegacy } from '.';
 import { getFilenameFromUrl, parseJSON } from './request.common';
 export { addInterceptor, addNetworkInterceptor } from './request.common';
 
@@ -90,9 +90,9 @@ function getData(data) {
     return content;
 }
 
-class HttpsResponseLegacyAndroid implements HttpsResponseLegacy {
+class HttpsResponseLegacy implements IHttpsResponseLegacy {
     //     private callback?: com.nativescript.https.OkhttpResponse.OkHttpResponseAsyncCallback;
-    constructor(private data: NSDictionary<string, any> & NSData & NSArray<any>, private url: string) {}
+    constructor(private data: NSDictionary<string, any> & NSData & NSArray<any>, public contentLength, private url: string) {}
     toArrayBufferAsync(): Promise<ArrayBuffer> {
         throw new Error('Method not implemented.');
     }
@@ -230,6 +230,7 @@ function AFFailure(resolve, reject, task: NSURLSessionDataTask, error: NSError,
     let getHeaders = () => ({});
     const sendi = ({
         task,
+        contentLength: task.countOfBytesReceived,
         reason: error.localizedDescription,
         get headers() {
             return getHeaders();
@@ -265,11 +266,12 @@ function AFFailure(resolve, reject, task: NSURLSessionDataTask, error: NSError,
             failure.description = '@nativescript-community/https > Invalid SSL certificate! ' + error.description;
         }
         sendi.failure = failure;
-        sendi.content = new HttpsResponseLegacyAndroid(data, url);
+        sendi.content = new HttpsResponseLegacy(data, sendi.contentLength, url);
         resolve(sendi);
     } else {
         const content: any = {
             body: parsedData,
+            contentLength: sendi.contentLength,
             description: error.description,
             reason: error.localizedDescription,
             url: failingURL ? failingURL.description : url,
@@ -379,10 +381,12 @@ export function createRequest(opts: HttpsRequestOptions, useLegacy: boolean = tr
             const success = function (task: NSURLSessionDataTask, data?: any) {
                 clearRunningRequest();
                 // TODO: refactor this code with failure one.
-                const content = useLegacy ? new HttpsResponseLegacyAndroid(data, opts.url) : getData(data);
+                const contentLength = task.countOfBytesReceived;
+                const content = useLegacy ? new HttpsResponseLegacy(data, contentLength, opts.url) : getData(data);
                 let getHeaders = () => ({});
                 const sendi = ({
                     content,
+                    contentLength,
                     get headers() {
                         return getHeaders();
                     },