improved error handling

Author: Arvid Paeglit

src/deepcode/constants/statusCodes.ts

@@ -5,8 +5,7 @@ import { BundlesModuleInterface } from "../../../interfaces/DeepCodeInterfaces";
 
 import LoginModule from "../../lib/modules/LoginModule";
 import { DEEPCODE_ANALYSIS_STATUS, DEEPCODE_CONTEXT } from "../../constants/views";
-import { errorsLogs } from "../../messages/errorsServerLogMessages";
-import { statusCodes } from '../../constants/statusCodes';
+import { errorsLogs } from '../../messages/errorsServerLogMessages';
 
 import { analyzeFolders, extendAnalysis } from '@deepcode/tsc';
 

src/deepcode/lib/modules/BundlesModule.ts

@@ -40,6 +40,10 @@ export default class DeepCodeLib extends BundlesModule implements DeepCodeLibInt
         return;
     }
 
+    await this.setContext(DEEPCODE_CONTEXT.ERROR, false);
+    this.resetTransientErrors();
+    await this.setLoadingBadge(false);
+
     if (!this.token) {
       await this.checkSession();
       return;
@@ -51,15 +55,9 @@ export default class DeepCodeLib extends BundlesModule implements DeepCodeLibInt
       return;
     }
 
-    // TODO: handle wrong/expired API Key issue
     try {
-      console.log('DeepCode: starting execution pipeline');
-      await this.setContext(DEEPCODE_CONTEXT.ERROR, false);
-      this.resetTransientErrors();
-      await this.setLoadingBadge(false);
       await this.startAnalysis();
     } catch (err) {
-      console.log('failed debounced function');
       await this.processError(err, {
         message: errorsLogs.failedExecutionDebounce,
       });

src/deepcode/lib/modules/DeepCodeLib.ts

@@ -1,12 +1,11 @@
 import { ReportModuleInterface, errorType } from "../../../interfaces/DeepCodeInterfaces";
-import BaseDeepCodeModule from "./BaseDeepCodeModule";
-import { statusCodes } from "../../constants/statusCodes";
+import BaseDeepCodeModule from './BaseDeepCodeModule';
 import { errorsLogs } from "../../messages/errorsServerLogMessages";
 import { TELEMETRY_EVENTS } from "../../constants/telemetry";
 import { DEEPCODE_CONTEXT, DEEPCODE_ERROR_CODES } from "../../constants/views";
 import { MAX_CONNECTION_RETRIES, CONNECTION_ERROR_RETRY_INTERVAL } from "../../constants/general";
 
-import { reportEvent, reportError } from '@deepcode/tsc';
+import { reportEvent, reportError, constants } from '@deepcode/tsc';
 
 abstract class ReportModule extends BaseDeepCodeModule implements ReportModuleInterface {
   private transientErrors = 0;
@@ -84,45 +83,43 @@ abstract class ReportModule extends BaseDeepCodeModule implements ReportModuleIn
   private async processErrorInternal(error: errorType, options: { [key: string]: any } = {}): Promise<void> {
     // console.error(`DeepCode error handler: ${JSON.stringify(error)}`);
 
-    if (error.error) {
-      const { code, message } = error.error;
-      // TODO: move it to 'tsc'
-      if (code === 'ENOTFOUND' && message === 'getaddrinfo ENOTFOUND www.deepcode.ai') {
-        return this.connectionErrorHandler();
-      }
-    }
-
-    if (error.errno) {
-      if (error.errno === 'ECONNREFUSED') return this.connectionErrorHandler();
+    const defaultErrorHandler = async () => {
       await this.sendErrorToServer(error, options);
-      return this.generalErrorHandler();
-    }
+      await this.generalErrorHandler();
+    };
 
-    const {
-      unauthorizedUser,
-      unauthorizedContent,
-      unauthorizedBundleAccess,
-      notFound,
-      serverError,
-      badGateway,
-      serviceUnavailable,
-      timeout,
-    } = statusCodes;
-
-    switch (error.statusCode) {
-      case serverError:
-      case badGateway:
-      case serviceUnavailable:
-      case timeout:
+    const errorHandlers: { [P in constants.ErrorCodes]: () => Promise<void> } = {
+      [constants.ErrorCodes.serverError]: defaultErrorHandler,
+      [constants.ErrorCodes.badGateway]: async () => {
+        return this.connectionErrorHandler();
+      },
+      [constants.ErrorCodes.serviceUnavailable]: async () => {
+        return this.connectionErrorHandler();
+      },
+      [constants.ErrorCodes.timeout]: async () => {
+        return this.connectionErrorHandler();
+      },
+      [constants.ErrorCodes.dnsNotFound]: async () => {
+        return this.connectionErrorHandler();
+      },
+      [constants.ErrorCodes.connectionRefused]: async () => {
         return this.connectionErrorHandler();
-      case unauthorizedContent:
-      case unauthorizedBundleAccess:
-      case unauthorizedUser:
+      },
+      [constants.ErrorCodes.loginInProgress]: async () => {},
+      [constants.ErrorCodes.unauthorizedContent]: async () => {},
+      [constants.ErrorCodes.unauthorizedUser]: async () => {
         return this.authenticationErrorHandler();
-      case notFound:
-      default:
-        await this.sendErrorToServer(error, options);
-        return this.generalErrorHandler();
+      },
+      [constants.ErrorCodes.unauthorizedBundleAccess]: async () => {},
+      [constants.ErrorCodes.notFound]: async () => {},
+      [constants.ErrorCodes.bigPayload]: async () => {},
+    };
+
+    const errorHandler = errorHandlers[error.statusCode];
+    if (errorHandler) {
+      await errorHandler();
+    } else {
+      await defaultErrorHandler();
     }
   }
 

src/deepcode/lib/modules/ReportModule.ts

@@ -2,7 +2,7 @@
   "version": "v1",
   "packages": {
     "@deepcode/tsc": {
-      "signature": "8dfc036aed29fdb3ecb8bafc17ff7b69",
+      "signature": "4b6fe85954a7581475117ad29cab1fb9",
       "file": true
     }
   }