Make interceptor queries resilient to exceptions in individual interceptors

Author: pimterry

src/commands/start.ts

@@ -1,15 +1,5 @@
-import * as Sentry from '@sentry/node';
-
-const packageJson = require('../../package.json');
-let { SENTRY_DSN } = process.env;
-if (!SENTRY_DSN && process.env.HTTPTOOLKIT_SERVER_BINPATH) {
-    // If we're a built binary, use the standard DSN automatically
-    SENTRY_DSN = 'https://[email protected]/1371158';
-}
-
-if (SENTRY_DSN) {
-    Sentry.init({ dsn: SENTRY_DSN, release: packageJson.version });
-}
+import { initErrorTracking } from '../error-tracking';
+initErrorTracking();
 
 import { Command, flags } from '@oclif/command'
 import { runHTK } from '../index';

src/error-tracking.ts

@@ -0,0 +1,28 @@
+import * as Sentry from '@sentry/node';
+
+let sentryInitialized = false;
+
+export function initErrorTracking() {
+    const packageJson = require('../package.json');
+    let { SENTRY_DSN } = process.env;
+    if (!SENTRY_DSN && process.env.HTTPTOOLKIT_SERVER_BINPATH) {
+        // If we're a built binary, use the standard DSN automatically
+        SENTRY_DSN = 'https://[email protected]/1371158';
+    }
+
+    if (SENTRY_DSN) {
+        Sentry.init({ dsn: SENTRY_DSN, release: packageJson.version });
+        sentryInitialized = true;
+    }
+}
+
+export function reportError(error: Error | string) {
+    console.warn(error);
+    if (!sentryInitialized) return;
+
+    if (typeof error === 'string') {
+        Sentry.captureMessage(error);
+    } else {
+        Sentry.captureException(error);
+    }
+}

src/httptoolkit-server.ts

@@ -4,6 +4,7 @@ import { GraphQLServer } from 'graphql-yoga'
 import { GraphQLScalarType } from 'graphql';
 
 import { HtkConfig } from './config';
+import { reportError } from './error-tracking';
 import { buildInterceptors, Interceptor } from './interceptors';
 
 const packageJson = require('../package.json');
@@ -85,10 +86,18 @@ const buildResolvers = (
 
         Interceptor: {
             isActivable: (interceptor: Interceptor) => {
-                return interceptor.isActivable();
+                return interceptor.isActivable().catch((e) => {
+                    reportError(e);
+                    return false;
+                });
             },
             isActive: (interceptor: Interceptor, args: _.Dictionary<any>) => {
-                return interceptor.isActive(args.proxyPort);
+                try {
+                    return interceptor.isActive(args.proxyPort);
+                } catch (e) {
+                    reportError(e);
+                    return false;
+                }
             }
         },