chore: use promises in fatal crash reporting and add logs

Author: a7medev

ios/RNInstabug/InstabugCrashReportingBridge.m

@@ -26,23 +26,29 @@ + (BOOL)requiresMainQueueSetup
     IBGCrashReporting.enabled = isEnabled;
 }
 
-RCT_EXPORT_METHOD(sendJSCrash:(NSDictionary *)stackTrace) {
+RCT_EXPORT_METHOD(sendJSCrash:(NSDictionary *)stackTrace
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject) {
     dispatch_queue_t queue = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0ul);
     dispatch_async(queue, ^{
         SEL reportCrashWithStackTraceSEL = NSSelectorFromString(@"reportCrashWithStackTrace:handled:");
         if ([[Instabug class] respondsToSelector:reportCrashWithStackTraceSEL]) {
             [[Instabug class] performSelector:reportCrashWithStackTraceSEL withObject:stackTrace withObject:@(NO)];
         }
+        resolve([NSNull null]);
     });
 }
 
-RCT_EXPORT_METHOD(sendHandledJSCrash:(NSDictionary *)stackTrace) {
+RCT_EXPORT_METHOD(sendHandledJSCrash:(NSDictionary *)stackTrace
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject) {
     dispatch_queue_t queue = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0ul);
     dispatch_async(queue, ^{
         SEL reportCrashWithStackTraceSEL = NSSelectorFromString(@"reportCrashWithStackTrace:handled:");
         if ([[Instabug class] respondsToSelector:reportCrashWithStackTraceSEL]) {
             [[Instabug class] performSelector:reportCrashWithStackTraceSEL withObject:stackTrace withObject:@(YES)];
         }
+        resolve([NSNull null]);
     });
 }
 

src/modules/CrashReporting.ts

@@ -17,5 +17,5 @@ export const setEnabled = (isEnabled: boolean) => {
  * @param error Error object to be sent to Instabug's servers
  */
 export const reportError = (error: ExtendedError) => {
-  InstabugUtils.sendCrashReport(error, NativeCrashReporting.sendHandledJSCrash);
+  return InstabugUtils.sendCrashReport(error, NativeCrashReporting.sendHandledJSCrash);
 };

src/native/NativeCrashReporting.ts

@@ -14,8 +14,8 @@ export interface CrashData {
 
 export interface CrashReportingNativeModule extends NativeModule {
   setEnabled(isEnabled: boolean): void;
-  sendJSCrash(data: CrashData | string): void;
-  sendHandledJSCrash(data: CrashData | string): void;
+  sendJSCrash(data: CrashData | string): Promise<void>;
+  sendHandledJSCrash(data: CrashData | string): Promise<void>;
 }
 
 export const NativeCrashReporting = NativeModules.IBGCrashReporting;

src/utils/InstabugUtils.ts

@@ -1,4 +1,4 @@
-import { ErrorHandlerCallback, Platform } from 'react-native';
+import { Platform } from 'react-native';
 import parseErrorStackLib, {
   ExtendedError,
   StackFrame,
@@ -67,12 +67,16 @@ export const captureJsErrors = () => {
 
   const originalErrorHandler = ErrorUtils.getGlobalHandler();
 
-  const instabugErrorHandler: ErrorHandlerCallback = (err) => {
-    sendCrashReport(err, NativeCrashReporting.sendJSCrash);
+  const instabugErrorHandler = (err: any, _isFatal?: boolean): Promise<void> => {
+    return sendCrashReport(err, NativeCrashReporting.sendJSCrash);
   };
 
-  ErrorUtils.setGlobalHandler((err, isFatal) => {
-    instabugErrorHandler(err, isFatal);
+  ErrorUtils.setGlobalHandler(async (err, isFatal) => {
+    console.log('IBG-RN: Captured a JavaScript error', err);
+
+    await instabugErrorHandler(err, isFatal);
+
+    console.log('IBG-RN: Reported the JavaScript error to Instabug', err);
 
     if (process.env.JEST_WORKER_ID) {
       return;
@@ -86,6 +90,8 @@ export const captureJsErrors = () => {
       originalErrorHandler(err, isFatal);
     }
   });
+
+  console.log('IBG-RN: Global error handler is now set.');
 };
 
 export const stringifyIfNotString = (input: unknown) => {
@@ -104,9 +110,9 @@ export const stringifyIfNotString = (input: unknown) => {
  * `sendCrashReport(error, NativeCrashReporting.sendJSCrash);`
  *
  */
-export function sendCrashReport(
+export async function sendCrashReport(
   error: ExtendedError,
-  remoteSenderCallback: (json: CrashData | string) => void,
+  remoteSenderCallback: (json: CrashData | string) => Promise<void>,
 ) {
   const jsStackTrace = getStackTrace(error);
 
@@ -120,10 +126,10 @@ export function sendCrashReport(
   };
 
   if (Platform.OS === 'android') {
-    remoteSenderCallback(JSON.stringify(jsonObject));
-  } else {
-    remoteSenderCallback(jsonObject);
+    return remoteSenderCallback(JSON.stringify(jsonObject));
   }
+
+  return remoteSenderCallback(jsonObject);
 }
 
 export default {