SHK-7520: Fixed ios network requests always 200

Author: smislav

example/ios/Podfile.lock

@@ -1322,7 +1322,7 @@ PODS:
     - ReactCodegen
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
-    - Shake-Staging (~> 17.0.0-rc)
+    - Shake-Staging (~> 17.1.0-rc)
     - Yoga
   - React-nativeconfig (0.76.3)
   - React-NativeModulesApple (0.76.3):
@@ -1605,7 +1605,7 @@ PODS:
     - RNFBApp
   - RNFS (2.20.0):
     - React-Core
-  - Shake-Staging (17.0.2-rc.1616)
+  - Shake-Staging (17.1.0-rc.1618)
   - SocketRocket (0.7.1)
   - Yoga (0.0.0)
 
@@ -1885,7 +1885,7 @@ SPEC CHECKSUMS:
   React-logger: 2736a90a3fdaed3dab1e2e9c5a5e9b3be00c287d
   React-Mapbuffer: 12bbf447b326f0de8a472998eceafbdc4f43ca4e
   React-microtasksnativemodule: 6483158af194b5bca6cc3c842451019c45100d80
-  react-native-shake: 4a7db319452f3b0c01adb15780cac3ba165baf5f
+  react-native-shake: fecbf5c3907abaf9857c18cbba411b59db3afbee
   React-nativeconfig: f2bddc1e6c2eb793c065b37e12c513fdea88afef
   React-NativeModulesApple: 43be3b84598af78efe8fcdbad90033caef83af43
   React-perflogger: 2991d4258277af250eb7a2705980ebb3ef9ba85e
@@ -1918,7 +1918,7 @@ SPEC CHECKSUMS:
   RNFBApp: 72b96921c64702d51eca9f3ed579c1777efd0d7e
   RNFBMessaging: 2ad5a47bd81da9f2d65188292d24115f40cbba74
   RNFS: 89de7d7f4c0f6bafa05343c578f61118c8282ed8
-  Shake-Staging: 969f693866a68e0ca7572b7c6b97388bbcb6697c
+  Shake-Staging: f77d61b3b376dbb23bfff829725ed49666ca5040
   SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
   Yoga: e6c2f5a192a47cd0c5523ec8c4f7eca01d15d077
 

example/src/ui/shake/MainScreen.tsx

@@ -131,7 +131,7 @@ const MainScreen = () => {
     // const oldForm = Shake.getShakeForm();
     // oldForm.components = oldForm.components.filter(c => c.type !== 'inspect');
 
-    const pickerItems: Array<ShakePickerItem> = [
+    const pickerItems: ShakePickerItem[] = [
       new ShakePickerItem('Mouse', 'Mouse', null, 'mouse'),
       new ShakePickerItem('Keyboard', 'Keyboard', null, 'keyboard'),
       new ShakePickerItem('Display', 'Display', null, 'display'),
@@ -206,22 +206,28 @@ const MainScreen = () => {
   };
 
   const setNotificationEventsFilter = () => {
-    Shake.setNotificationEventsFilter((notificationEvent) => {
-      notificationEvent.setDescription('data_redacted');
-      notificationEvent.setTitle('data_redacted');
-
-      return notificationEvent;
-    });
+    Shake.setNotificationEventsFilter(
+      (
+        notificationEvent: NotificationEventBuilder
+      ): NotificationEventBuilder | null => {
+        notificationEvent.setDescription('data_redacted');
+        notificationEvent.setTitle('data_redacted');
+
+        return notificationEvent;
+      }
+    );
   };
 
   const setNetworkRequestsFilter = () => {
-    Shake.setNetworkRequestsFilter((networkRequest) => {
-      networkRequest.setResponseBody('data_redacted');
-      networkRequest.setRequestBody('data_redacted');
-      networkRequest.setDate(new Date());
-
-      return networkRequest;
-    });
+    Shake.setNetworkRequestsFilter(
+      (networkRequest: NetworkRequestBuilder): NetworkRequestBuilder | null => {
+        networkRequest.setResponseBody('data_redacted');
+        networkRequest.setRequestBody('data_redacted');
+        networkRequest.setDate(new Date());
+
+        return networkRequest;
+      }
+    );
   };
 
   const showNotificationsSettings = () => {

ios/Shake.mm

@@ -719,20 +719,30 @@ - (NSDictionary*)mapToNetworkRequestToDict:(JS::NativeShake::NetworkRequest &)na
     NSDictionary *networkRequest = [[NSDictionary alloc] init];
     NSString *requestBody = nativeNetworkRequest.requestBody() ?: @"";
     NSData *data = [requestBody dataUsingEncoding:NSUTF8StringEncoding];
+    NSNumber* statusCode = [self parseIntegerFromString:nativeNetworkRequest.statusCode()];
+
     networkRequest = @{
         @"url": nativeNetworkRequest.url() ?: @"",
         @"method": nativeNetworkRequest.method() ?: @"",
         @"responseBody": nativeNetworkRequest.responseBody() ?: @"",
-        @"statusCode": nativeNetworkRequest.statusCode() ?: @"",
+        @"statusCode": statusCode ?: 0,
         @"requestBody": data,
         @"requestHeaders": nativeNetworkRequest.requestHeaders() ?: @{},
         @"duration": [NSNumber numberWithDouble:nativeNetworkRequest.duration() ?: 0],
         @"responseHeaders": nativeNetworkRequest.responseHeaders() ?: @{},
         @"timestamp": nativeNetworkRequest.timestamp() ?: @""
     };
+
     return networkRequest;
 }
 
+- (NSNumber *)parseIntegerFromString:(NSString *)string {
+    NSNumberFormatter *formatter = [[NSNumberFormatter alloc] init];
+    formatter.numberStyle = NSNumberFormatterNoStyle;
+
+    return [formatter numberFromString:string];
+}
+
 - (NSDictionary*)mapToNotificationEvent:(JS::NativeShake::NotificationEvent &)nativeNotification
 {
     NSDictionary *notificationEvent = [[NSDictionary alloc] init];

src/index.ts

@@ -389,7 +389,9 @@ class Shake {
    * @param {((builder: NetworkRequestBuilder) => NetworkRequestBuilder) | null} filter function
    */
   static setNetworkRequestsFilter(
-    filter: ((builder: NetworkRequestBuilder) => NetworkRequestBuilder) | null
+    filter:
+      | ((builder: NetworkRequestBuilder) => NetworkRequestBuilder | null)
+      | null
   ) {
     this.networkTracker.setFilter(filter);
   }
@@ -412,7 +414,7 @@ class Shake {
    */
   static setNotificationEventsFilter(
     filter:
-      | ((builder: NotificationEventBuilder) => NotificationEventBuilder)
+      | ((builder: NotificationEventBuilder) => NotificationEventBuilder | null)
       | null
   ) {
     this.notificationTracker.setFilter(filter);

src/modules/NetworkTracker.ts

@@ -9,7 +9,7 @@ class NetworkTracker {
   shake: any;
   enabled: boolean = false;
   filter:
-    | ((requestBuilder: NetworkRequestBuilder) => NetworkRequestBuilder)
+    | ((requestBuilder: NetworkRequestBuilder) => NetworkRequestBuilder | null)
     | null = null;
 
   constructor(shake: any) {
@@ -41,7 +41,9 @@ class NetworkTracker {
    */
   setFilter = (
     filter:
-      | ((requestBuilder: NetworkRequestBuilder) => NetworkRequestBuilder)
+      | ((
+          requestBuilder: NetworkRequestBuilder
+        ) => NetworkRequestBuilder | null)
       | null
   ) => {
     this.filter = filter;
@@ -53,10 +55,10 @@ class NetworkTracker {
    */
   insertNetworkRequest = (networkRequestBuilder: NetworkRequestBuilder) => {
     if (this.filter) {
-      networkRequestBuilder = this.filter(networkRequestBuilder);
-      if (networkRequestBuilder) {
-        this.shake.insertNetworkRequest(networkRequestBuilder.build());
-      }
+      let newBuilder: NetworkRequestBuilder | null = this.filter(
+        networkRequestBuilder
+      );
+      if (newBuilder) this.shake.insertNetworkRequest(newBuilder.build());
     } else {
       this.shake.insertNetworkRequest(networkRequestBuilder.build());
     }

src/modules/NotificationTracker.ts

@@ -12,7 +12,9 @@ class NotificationTracker {
   shake: any;
   enabled: boolean;
   filter:
-    | ((requestBuilder: NotificationEventBuilder) => NotificationEventBuilder)
+    | ((
+        requestBuilder: NotificationEventBuilder
+      ) => NotificationEventBuilder | null)
     | null;
 
   constructor(shake: any) {
@@ -36,7 +38,9 @@ class NotificationTracker {
    */
   setFilter = (
     filter:
-      | ((requestBuilder: NotificationEventBuilder) => NotificationEventBuilder)
+      | ((
+          requestBuilder: NotificationEventBuilder
+        ) => NotificationEventBuilder | null)
       | null
   ) => {
     this.filter = filter;
@@ -50,10 +54,10 @@ class NotificationTracker {
     notificationEventBuilder: NotificationEventBuilder
   ) => {
     if (this.filter) {
-      notificationEventBuilder = this.filter(notificationEventBuilder);
-      if (notificationEventBuilder) {
-        this.shake.insertNotificationEvent(notificationEventBuilder.build());
-      }
+      const newBuilder: NotificationEventBuilder | null = this.filter(
+        notificationEventBuilder
+      );
+      if (newBuilder) this.shake.insertNotificationEvent(newBuilder.build());
     } else {
       this.shake.insertNotificationEvent(notificationEventBuilder.build());
     }

src/utils/XHRInterceptor.ts

@@ -86,7 +86,7 @@ const XHRInterceptor = {
           networkRequestClone.responseBody = responseText ? responseText : '';
           networkRequestClone.statusCode = this.status
             ? this.status.toString()
-            : 'n/a';
+            : '0';
 
           reportRequest(networkRequestClone);
         });
@@ -98,7 +98,7 @@ const XHRInterceptor = {
 
           networkRequestClone.duration = Date.now() - networkRequestClone.start;
           networkRequestClone.responseBody = 'Request error.';
-          networkRequestClone.statusCode = 'err';
+          networkRequestClone.statusCode = '500';
 
           reportRequest(networkRequestClone);
         });
@@ -108,7 +108,7 @@ const XHRInterceptor = {
 
           networkRequestClone.duration = Date.now() - networkRequestClone.start;
           networkRequestClone.responseBody = 'Request aborted.';
-          networkRequestClone.statusCode = 'err';
+          networkRequestClone.statusCode = '499';
 
           reportRequest(networkRequestClone);
         });
@@ -118,7 +118,7 @@ const XHRInterceptor = {
 
           networkRequestClone.duration = Date.now() - networkRequestClone.start;
           networkRequestClone.responseBody = 'Request timeout.';
-          networkRequestClone.statusCode = 't/o';
+          networkRequestClone.statusCode = '408';
 
           reportRequest(networkRequestClone);
         });