Added error handling

Author: shinin-light

package.json

@@ -92,20 +92,30 @@
     },
     "views": {
       "deepcode": [
+        {
+          "id": "deepcode.views.error",
+          "name": "DeepCode Extension",
+          "when": "deepcode:error"
+        },
         {
           "id": "deepcode.views.welcome",
           "name": "DeepCode Extension",
-          "when": "!deepcode:loggedIn"
+          "when": "!deepcode:error && !deepcode:loggedIn"
+        },
+        {
+          "id": "deepcode.views.tc",
+          "name": "DeepCode Extension",
+          "when": "!deepcode:error && deepcode:loggedIn && !deepcode:uploadApproved"
         },
         {
           "id": "deepcode.views.progress",
           "name": "DeepCode Analysis",
-          "when": "deepcode:loggedIn && deepcode:analyzing"
+          "when": "!deepcode:error && deepcode:loggedIn && deepcode:uploadApproved && !deepcode:analysisCompleted"
         },
         {
           "id": "deepcode.views.analysis",
           "name": "DeepCode Analysis",
-          "when": "deepcode:loggedIn && deepcode:completed"
+          "when": "!deepcode:error && deepcode:loggedIn && deepcode:uploadApproved && deepcode:analysisCompleted"
         },
         {
           "id": "deepcode.views.support",
@@ -114,17 +124,31 @@
       ]
     },
     "viewsWelcome": [
+      {
+        "view": "deepcode.views.error",
+        "contents": "DeepCode is temporarily unavailable, we are automatically retrying to connect...",
+        "when": "deepcode:error == 'transient'"
+      },
+      {
+        "view": "deepcode.views.error",
+        "contents": "DeepCode has encountered a problem. Please restart the extension: \n[Restart](command:deepcode.start 'Restart DeepCode')\nIf the error persists, please check your [settings](command:deepcode.settings) and [contact us](https://www.deepcode.ai/feedback?select=2)!",
+        "when": "deepcode:error != 'transient'"
+      },
       {
         "view": "deepcode.views.welcome",
         "contents": "Welcome to DeepCode for Visual Studio Code. 👋\nLet's start by connecting VS Code with DeepCode:\n[Connect VS Code with DeepCode](command:deepcode.login 'Connect with DeepCode')\n🚀 DeepCode's mission is to find bugs in your Javascript, TypeScript, Python, Java and C/C++ code, fast!\n💬 A VS Code user (Lucas) recently said:\"I'm really crazy about this super simple service that feels like it's from 5 years in the future\".\n👉 Connect with DeepCode and start your first analysis!"
       },
+      {
+        "view": "deepcode.views.tc",
+        "contents": "Thanks for connecting with DeepCode. ✅\n 👉 You are almost set 🤗, let's confirm and start the remote analysis - feel free to check out our [terms and conditions](https://www.deepcode.ai/tc?utm_source=vsc) if you are into this.\n[Accept code upload](command:deepcode.approveUpload 'Upload code to DeepCode')\nYou can always change it later in the [settings](command:deepcode.settings)!"
+      },
       {
         "view": "deepcode.views.progress",
-        "contents": "IN PROGRESS"
+        "contents": "Analysis in progress"
       },
       {
         "view": "deepcode.views.analysis",
-        "contents": "ANALYZED"
+        "contents": "DeepCode analyzed your code and found no issue!"
       }
     ],
     "menus": {
@@ -133,20 +157,38 @@
           "command": "deepcode.start",
           "when": "deepcode:loggedIn"
         }
+      ],
+      "view/title": [
+        {
+          "command": "deepcode.settings",
+          "when": "view == deepcode.views.support",
+          "group": "navigation"
+        },
+        {
+          "command": "deepcode.start",
+          "when": "view == deepcode.views.analysis",
+          "group": "navigation"
+        }
       ]
     },
     "commands": [
       {
         "command": "deepcode.start",
-        "title": "DeepCode re-scan"
+        "title": "DeepCode re-scan",
+        "icon": "images/icon-sidebar.svg"
       },
       {
         "command": "deepcode.settings",
-        "title": "DeepCode settings"
+        "title": "DeepCode settings",
+        "icon": "images/icon-sidebar.svg"
       },
       {
         "command": "deepcode.login",
         "title": "DeepCode login"
+      },
+      {
+        "command": "deepcode.approve",
+        "title": "DeepCode approve upload and remote analysis"
       }
     ]
   },

src/config/DeepCodeStore.ts

@@ -8,6 +8,7 @@ import {
   DEEPCODE_START_COMMAND, 
   DEEPCODE_SETTINGS_COMMAND,
   DEEPCODE_LOGIN,
+  DEEPCODE_APPROVE,
   DEEPCODE_OPEN_BROWSER,
   DEEPCODE_OPEN_LOCAL,
 } from "./constants/commands";
@@ -24,7 +25,6 @@ import { IssueProvider } from "./view/IssueProvider";
 
 class DeepCodeExtension extends DeepCodeLib implements DeepCode.ExtensionInterface {
   public activate(context: vscode.ExtensionContext): void {
-    this.store.createStore(context);
     this.statusBarItem.show();
 
     context.subscriptions.push(
@@ -50,14 +50,21 @@ class DeepCodeExtension extends DeepCodeLib implements DeepCode.ExtensionInterfa
     context.subscriptions.push(
       vscode.commands.registerCommand(
         DEEPCODE_LOGIN,
-        this.activateExtensionAnalyzeActions.bind(this)
+        this.initiateLogin.bind(this)
+      )
+    );
+    
+    context.subscriptions.push(
+      vscode.commands.registerCommand(
+        DEEPCODE_APPROVE,
+        this.approveUpload.bind(this)
       )
     );
 
     context.subscriptions.push(
       vscode.commands.registerCommand(
         DEEPCODE_START_COMMAND,
-        this.activateExtensionAnalyzeActions.bind(this)
+        this.startExtension.bind(this)
       )
     );
 
@@ -83,28 +90,19 @@ class DeepCodeExtension extends DeepCodeLib implements DeepCode.ExtensionInterfa
       new IssueProvider(this)
     );
 
-    context.subscriptions.push(
-      { dispose: this.startExtension() },
-    );
-
-    this.runMigration();
-  }
-
-  private runMigration() {
-    // TODO: remove it after 01.06.2020
-    // Move 'deepcode.api.cloudBackend' to 'deepcode.url' configuration
-    const config = vscode.workspace.getConfiguration('deepcode');
-    const oldBaseURL = config.get('api.cloudBackend');
-    if (!config.get('url') && oldBaseURL) {
-      config.update('url', oldBaseURL, true);
-    }
-  }
+    // context.subscriptions.push(
+    //   { dispose: this.startExtension() },
+    // );
 
-  public startExtension(): any {
     this.activateAll();
-    this.activateExtensionAnalyzeActions();
+    this.startExtension();
   }
 
+  // public startExtension(): any {
+  //   this.activateAll();
+  //   this.activateExtensionAnalyzeActions();
+  // }
+
 }
 
 export default DeepCodeExtension;

src/deepcode/DeepCodeExtension.ts

@@ -5,6 +5,7 @@ export const VSCODE_ADD_COMMENT_COMMAND = "editor.action.addCommentLine";
 // custom depcode commands
 export const DEEPCODE_START_COMMAND = "deepcode.start";
 export const DEEPCODE_LOGIN = "deepcode.login";
+export const DEEPCODE_APPROVE = "deepcode.approve";
 export const DEEPCODE_SETTINGS_COMMAND = "deepcode.settings";
 export const DEEPCODE_IGNORE_ISSUES_COMMAND = "deepcode.ignoreissues";
 export const DEEPCODE_OPEN_BROWSER = "deepcode.open";

src/deepcode/constants/commands.ts

@@ -1,4 +1,5 @@
 // Changing this requires changing display name in package.json.
 export const DEEPCODE_NAME = "DeepCode";
 export const ALLOWED_PAYLOAD_SIZE = 1024 * 1024 * 4; // max payload size of 4MB in bytes
+export const MAX_CONNECTION_RETRIES = 5; // max number of automatic retries before showing an error
 export const IDE_NAME = "vscode";

src/deepcode/constants/general.ts

@@ -4,11 +4,18 @@ export const DEEPCODE_VIEW_ANALYSIS = "deepcode.views.analysis";
 
 export const DEEPCODE_CONTEXT = {
   LOGGEDIN: "loggedIn",
-  ANALYZING: "analyzing",
-  COMPLETED: "completed",
+  APPROVED: "uploadApproved",
+  COMPLETED: "analysisCompleted",
+  ERROR: "error",
+};
+
+export const DEEPCODE_ERROR_CODES = {
+  TRANSIENT: "transient",
+  BLOCKING: "blocking",
 };
 
 export const DEEPCODE_ANALYSIS_STATUS = {
+  COLLECTING: "Collecting files",
   HASHING: "Hashing files",
   UPLOADING: "Uploading files",
   ANALYZING: "Analyzing files",

src/deepcode/constants/views.ts

@@ -223,7 +223,7 @@ class DeepCodeAnalyzer implements DeepCode.AnalyzerInterface {
         this.setIssuesMarkersDecoration();
       }
     } catch (err) {
-      extension.errorHandler.processError(extension, err, {
+      extension.processError(err, {
         message: errorsLogs.updateReviewPositions,
         bundleId: (extension.remoteBundles[updatedFile.workspace] || {}).bundleId,
         data: {
@@ -233,38 +233,38 @@ class DeepCodeAnalyzer implements DeepCode.AnalyzerInterface {
     }
   }
 
-  private async processFailedReviewCodeResults(
-    extension: DeepCode.ExtensionInterface,
-    path: string
-  ): Promise<void> {
-    const { bundleId } = extension.remoteBundles[path];
-    extension.errorHandler.processError(extension, new Error(), {
-      message: errorsLogs.failedStatusOfAnalysis,
-      bundleId
-    });
-    const workspace = vscode.workspace.workspaceFolders
-      ? vscode.workspace.workspaceFolders.find(folder => {
-          return folder.uri.fsPath === path;
-        })
-      : { name: "" };
-    const workspaceName = workspace ? workspace.name : "";
-    const {
-      msg: analysisErrorMsg,
-      button: analysisErrorBtn
-    } = deepCodeMessages.codeReviewFailed;
-    const analysisErrorButton:
-      | string
-      | undefined = await vscode.window.showErrorMessage(
-      analysisErrorMsg(workspaceName),
-      analysisErrorBtn
-    );
-    if (analysisErrorButton === analysisErrorBtn) {
-      // if analysis status === FAILED,
-      // we create new bundle, send it, check it and trigger new review
-      await extension.updateHashesBundles(path);
-      await extension.performBundlesActions(path);
-    }
-  }
+  // private async processFailedReviewCodeResults(
+  //   extension: DeepCode.ExtensionInterface,
+  //   path: string
+  // ): Promise<void> {
+  //   const { bundleId } = extension.remoteBundles[path];
+  //   extension.processError(new Error(), {
+  //     message: errorsLogs.failedStatusOfAnalysis,
+  //     bundleId
+  //   });
+  //   const workspace = vscode.workspace.workspaceFolders
+  //     ? vscode.workspace.workspaceFolders.find(folder => {
+  //         return folder.uri.fsPath === path;
+  //       })
+  //     : { name: "" };
+  //   const workspaceName = workspace ? workspace.name : "";
+  //   const {
+  //     msg: analysisErrorMsg,
+  //     button: analysisErrorBtn
+  //   } = deepCodeMessages.codeReviewFailed;
+  //   const analysisErrorButton:
+  //     | string
+  //     | undefined = await vscode.window.showErrorMessage(
+  //     analysisErrorMsg(workspaceName),
+  //     analysisErrorBtn
+  //   );
+  //   if (analysisErrorButton === analysisErrorBtn) {
+  //     // if analysis status === FAILED,
+  //     // we create new bundle, send it, check it and trigger new review
+  //     await extension.updateHashesBundles(path);
+  //     await extension.performBundlesActions(path);
+  //   }
+  // }
 
   public async removeReviewResults(workspacePath: string): Promise<void> {
     await delete this.analysisResultsCollection[workspacePath];