chore(lib): move sentryhub guard to wrapper (#10)

Author: faris-imi

lib/__test__/sentry.test.ts

@@ -38,11 +38,16 @@ describe('Sentry', () => {
     expect(hub).toBeTruthy();
   });
 
-  it('should return null if Sentry is disabled', () => {
-    const hub = initSentry(false);
-    expect(Sentry.BrowserClient).not.toHaveBeenCalled();
-    expect(Sentry.Hub).not.toHaveBeenCalled();
-    expect(hub).toBeNull();
+  it('should not throw when Sentry is false', () => {
+    const sentryHubWrapper = getSentryHubWrapper(false);
+
+    const testWrapperCall = () => {
+      sentryHubWrapper.addBreadcrumb({ category: 'test' });
+      sentryHubWrapper.captureMessage('test message');
+      sentryHubWrapper.captureException('test error');
+    };
+
+    expect(testWrapperCall).not.toThrow();
   });
 
   it('should get initialized Sentry Hub', () => {
@@ -64,7 +69,7 @@ describe('Sentry', () => {
     };
 
     const tag = { key: 'testKey', value: 'testValue' };
-    const breadcrumb = { category: 'test breadcrumb' };
+    const breadcrumb = { category: 'test' };
 
     const sentryHubWrapper = getSentryHubWrapper(mockHub, tag);
 

lib/src/loader.ts

@@ -14,7 +14,7 @@ export function hCaptchaLoader(params: ILoaderParams = { cleanup: true }): Promi
 
   try {
 
-    sentry?.addBreadcrumb({
+    sentry.addBreadcrumb({
       category: 'script',
       message: 'hCaptcha loader params',
       data: params,
@@ -25,7 +25,7 @@ export function hCaptchaLoader(params: ILoaderParams = { cleanup: true }): Promi
     const script = hCaptchaScripts.find(({ scope }) => scope === frame.window);
 
     if (script) {
-      sentry?.addBreadcrumb({
+      sentry.addBreadcrumb({
         category: 'script',
         message: 'hCaptcha already loaded',
       });
@@ -41,7 +41,7 @@ export function hCaptchaLoader(params: ILoaderParams = { cleanup: true }): Promi
 
           // Create global onload callback for the hCaptcha library to call
           frame.window[HCAPTCHA_LOAD_FN_NAME] = () => {
-            sentry?.addBreadcrumb({
+            sentry.addBreadcrumb({
               category: 'hCaptcha:script',
               message: 'hCaptcha script called onload function',
             });
@@ -65,16 +65,16 @@ export function hCaptchaLoader(params: ILoaderParams = { cleanup: true }): Promi
 
           await fetchScript({ query, ...params });
 
-          sentry?.addBreadcrumb({
+          sentry.addBreadcrumb({
             category: 'hCaptcha:script',
             message: 'hCaptcha loaded',
           });
         } catch(error) {
-          sentry?.addBreadcrumb({
+          sentry.addBreadcrumb({
             category: 'hCaptcha:script',
             message: 'hCaptcha failed to load',
           });
-          sentry?.captureException(error);
+          sentry.captureException(error);
           reject(new Error(SCRIPT_ERROR));
         }
       }
@@ -83,8 +83,8 @@ export function hCaptchaLoader(params: ILoaderParams = { cleanup: true }): Promi
     hCaptchaScripts.push({ promise, scope: frame.window });
 
     return promise;
-  } catch (e) {
-    sentry?.captureException(e);
+  } catch (error) {
+    sentry.captureException(error);
     return Promise.reject(new Error(SCRIPT_ERROR));
   }
 }

lib/src/sentry.ts

@@ -13,7 +13,7 @@ export function initSentry(
 
   // Sentry disabled in params
   if (sentry === false) {
-    return null;
+    return getSentryHubWrapper(sentry);
   }
 
   // Client was already created
@@ -52,15 +52,30 @@ export function getSentryHubWrapper(
   }): SentryHub {
 
   return {
-    addBreadcrumb: (breadcrumb) => sentryHub.addBreadcrumb(breadcrumb),
+
+    addBreadcrumb: (breadcrumb) => {
+      if (!sentryHub) {
+        return;
+      }
+
+      sentryHub.addBreadcrumb(breadcrumb);
+    },
     captureMessage: (message) => {
+      if (!sentryHub) {
+        return;
+      }
+
       sentryHub.withScope(function (scope) {
         scope.setTag(tag.key, tag.value);
 
         sentryHub.captureMessage(message);
       });
     },
     captureException: (e) => {
+      if (!sentryHub) {
+        return;
+      }
+
       sentryHub.withScope(function (scope) {
         scope.setTag(tag.key, tag.value);