Support APM JS network calls

Author: AliAbdelfattah

ios/RNInstabug/InstabugReactBridge.m

@@ -351,7 +351,12 @@ - (dispatch_queue_t)methodQueue {
     NSString* url = networkData[@"url"];
     NSString* method = networkData[@"method"];
     NSString* requestBody = networkData[@"requestBody"];
-    NSString* responseBody = networkData[@"responseBody"];
+    int64_t requestBodySize = [networkData[@"requestBodySize"] integerValue];
+    NSString* responseBody = nil;
+    if (networkData[@"responseBody"] != [NSNull null]) {
+        responseBody = networkData[@"responseBody"];
+    }
+    int64_t responseBodySize = [networkData[@"responseBodySize"] integerValue];
     int32_t responseCode = [networkData[@"responseCode"] integerValue];
     NSDictionary* requestHeaders = @{};
     if([networkData[@"requestHeaders"] isKindOfClass:[NSDictionary class]]){
@@ -362,9 +367,12 @@ - (dispatch_queue_t)methodQueue {
         responseHeaders = networkData[@"responseHeaders"];
     }
     NSString* contentType = networkData[@"contentType"];
-    double duration = [networkData[@"duration"] doubleValue];
+    NSString* errorDomain = networkData[@"errorDomain"];
+    int32_t errorCode = [networkData[@"errorCode"] integerValue];
+    int64_t startTime = [networkData[@"startTime"] integerValue] * 1000;
+    int64_t duration = [networkData[@"duration"] doubleValue] * 1000;
 
-    SEL networkLogSEL = NSSelectorFromString(@"addNetworkLogWithUrl:method:requestBody:responseBody:responseCode:requestHeaders:responseHeaders:contentType:duration:");
+    SEL networkLogSEL = NSSelectorFromString(@"addNetworkLogWithUrl:method:requestBody:requestBodySize:responseBody:responseBodySize:responseCode:requestHeaders:responseHeaders:contentType:errorDomain:errorCode:startTime:duration:");
 
     if([[IBGNetworkLogger class] respondsToSelector:networkLogSEL]) {
         NSInvocation *inv = [NSInvocation invocationWithMethodSignature:[[IBGNetworkLogger class] methodSignatureForSelector:networkLogSEL]];
@@ -374,12 +382,17 @@ - (dispatch_queue_t)methodQueue {
         [inv setArgument:&(url) atIndex:2];
         [inv setArgument:&(method) atIndex:3];
         [inv setArgument:&(requestBody) atIndex:4];
-        [inv setArgument:&(responseBody) atIndex:5];
-        [inv setArgument:&(responseCode) atIndex:6];
-        [inv setArgument:&(requestHeaders) atIndex:7];
-        [inv setArgument:&(responseHeaders) atIndex:8];
-        [inv setArgument:&(contentType) atIndex:9];
-        [inv setArgument:&(duration) atIndex:10];
+        [inv setArgument:&(requestBodySize) atIndex:5];
+        [inv setArgument:&(responseBody) atIndex:6];
+        [inv setArgument:&(responseBodySize) atIndex:7];
+        [inv setArgument:&(responseCode) atIndex:8];
+        [inv setArgument:&(requestHeaders) atIndex:9];
+        [inv setArgument:&(responseHeaders) atIndex:10];
+        [inv setArgument:&(contentType) atIndex:11];
+        [inv setArgument:&(errorDomain) atIndex:12];
+        [inv setArgument:&(errorCode) atIndex:13];
+        [inv setArgument:&(startTime) atIndex:14];
+        [inv setArgument:&(duration) atIndex:15];
 
         [inv invoke];
     }

utils/XhrNetworkInterceptor.js

@@ -13,15 +13,19 @@ var network;
 const _reset = () => {
   network = {
     url: '',
-    requestBody: '',
-    requestHeaders: {},
     method: '',
+    requestBody: '',
+    requestBodySize: 0,
     responseBody: '',
+    responseBodySize: 0,
     responseCode: 0,
+    requestHeaders: {},
     responseHeaders: {},
     contentType: '',
+    errorDomain: '',
+    errorCode: 0,
+    startTime: 0,
     duration: 0,
-    start: 0
   };
 }
 
@@ -64,6 +68,12 @@ const XHRInterceptor = {
               if (contentTypeString) {
                 cloneNetwork.contentType = contentTypeString.split(';')[0];
               }
+              const responseBodySizeString = this.getResponseHeader('Content-Length');
+              if (responseBodySizeString) {
+                const responseBodySizeNumber = Number(responseBodySizeString);
+
+                if (!isNaN(responseBodySizeNumber)) cloneNetwork.responseBodySize = responseBodySizeNumber;
+              }
 
               if (this.getAllResponseHeaders()) {
                 const responseHeaders = this.getAllResponseHeaders().split('\r\n');
@@ -77,7 +87,7 @@ const XHRInterceptor = {
               }
             }
             if (this.readyState === this.DONE) {
-              cloneNetwork.duration = (Date.now() - cloneNetwork.start);
+              cloneNetwork.duration = (Date.now() - cloneNetwork.startTime);
               if (this.status == null) {
                 cloneNetwork.responseCode = 0;
               } else {
@@ -94,7 +104,11 @@ const XHRInterceptor = {
               }
 
               if (this._hasError) {
+                cloneNetwork.errorCode = 0;
+                cloneNetwork.errorDomain = 'ClientError';
+
                 cloneNetwork.requestBody = this._response;
+                cloneNetwork.responseBody = null;
               }
               if (onDoneCallback) {
                 onDoneCallback(cloneNetwork);
@@ -119,7 +133,7 @@ const XHRInterceptor = {
         this.upload.addEventListener('progress', downloadUploadProgressCallback);
       }
 
-      cloneNetwork.start = Date.now();
+      cloneNetwork.startTime = Date.now();
       originalXHRSend.apply(this, arguments);
     };
     isInterceptorEnabled = true;