Report startup & interceptor activation errors

Author: pimterry

src/commands/start.ts

@@ -1,6 +1,6 @@
 // Import types only from TS
-import * as ErrorTrackingModule from '../error-tracking';
-import * as IndexTypeModule from '../index';
+type ErrorTrackingModule = typeof import('../error-tracking');
+type IndexTypeModule = typeof import('../index');
 
 import { IS_PROD_BUILD } from '../util';
 
@@ -19,12 +19,12 @@ function maybeBundleImport<T>(moduleName: string): T {
         return require('../' + moduleName);
     }
 }
-const { initErrorTracking } = maybeBundleImport<typeof ErrorTrackingModule>('error-tracking');
+const { initErrorTracking, reportError } = maybeBundleImport<ErrorTrackingModule>('error-tracking');
 initErrorTracking();
 
 import { Command, flags } from '@oclif/command'
 
-const { runHTK } = maybeBundleImport<typeof IndexTypeModule>('index');
+const { runHTK } = maybeBundleImport<IndexTypeModule>('index');
 
 class HttpToolkitServer extends Command {
     static description = 'start the HTTP Toolkit server'
@@ -39,7 +39,10 @@ class HttpToolkitServer extends Command {
     async run() {
         const { flags } = this.parse(HttpToolkitServer);
 
-        await runHTK({ configPath: flags.config });
+        await runHTK({ configPath: flags.config }).catch(async (error) => {
+            await reportError(error);
+            throw error;
+        });
     }
 }
 

src/error-tracking.ts

@@ -82,7 +82,7 @@ export function addBreadcrumb(message: string, data: Sentry.Breadcrumb) {
     Sentry.addBreadcrumb(Object.assign({ message }, data));
 }
 
-export function reportError(error: Error | string) {
+export function reportError(error: Error | string): undefined | Promise<void> {
     console.warn(error);
     if (!sentryInitialized) return;
 
@@ -91,4 +91,8 @@ export function reportError(error: Error | string) {
     } else {
         Sentry.captureException(error);
     }
+
+    return Sentry.flush(500).then((sentSuccessfully) => {
+        if (sentSuccessfully === false) console.log('Error reporting timed out');
+    });
 }

src/httptoolkit-server.ts

@@ -75,7 +75,7 @@ const buildResolvers = (
                 if (!interceptor) throw new Error(`Unknown interceptor ${id}`);
 
                 await Promise.race([
-                    interceptor.activate(proxyPort, options),
+                    interceptor.activate(proxyPort, options).catch(reportError),
                     delay(30000) // After 30s, we don't stop activating, but we do report failure
                 ]);
 
@@ -95,7 +95,7 @@ const buildResolvers = (
                 const interceptor = interceptors[id];
                 if (!interceptor) throw new Error(`Unknown interceptor ${id}`);
 
-                await interceptor.deactivate(proxyPort, options);
+                await interceptor.deactivate(proxyPort, options).catch(reportError);
                 return !interceptor.isActive(proxyPort);
             },
             triggerUpdate: () => {