refactoring of vscode: mostly removing trash

Author: Arvid Paeglit

src/deepcode/http/requests.ts

@@ -13,12 +13,13 @@ import { setContext } from "../../utils/vscodeCommandsUtils";
 import { DEEPCODE_VIEW_ANALYSIS } from "../../constants/views";
 import { errorsLogs } from '../../messages/errorsServerLogMessages';
 import { pendingMocks } from 'nock/types';
+import { IServiceAI, ServiceAI } from '@deepcode/tsc';
 
 export default abstract class BaseDeepCodeModule implements DeepCode.BaseDeepCodeModuleInterface {
+  serviceAI: IServiceAI;
   currentWorkspacePath: string;
   workspacesPaths: Array<string>;
   hashesBundles: DeepCode.HashesBundlesInterface;
-  serverFilesFilterList: DeepCode.AllowedServerFilterListInterface;
   remoteBundles: DeepCode.RemoteBundlesCollectionInterface;
   analyzer: DeepCode.AnalyzerInterface;
   statusBarItem: DeepCode.StatusBarItemInterface;
@@ -42,10 +43,10 @@ export default abstract class BaseDeepCodeModule implements DeepCode.BaseDeepCod
   staticUploadApproved = false;
 
   constructor() {
+    this.serviceAI = new ServiceAI();
     this.currentWorkspacePath = "";
     this.workspacesPaths = [];
     this.hashesBundles = {};
-    this.serverFilesFilterList = {};
     this.remoteBundles = {};
     this.analyzer = new DeepCodeAnalyzer();
     this.statusBarItem = new DeepCodeStatusBarItem();

src/deepcode/lib/modules/BaseDeepCodeModule.ts

@@ -1,6 +1,6 @@
 import * as vscode from "vscode";
 import * as _ from "lodash";
-import http from "../../http/requests";
+
 import DeepCode from "../../../interfaces/DeepCodeInterfaces";
 import { IQueueAnalysisCheckResult } from "@deepcode/tsc";
 import { checkIfBundleIsEmpty } from "../../utils/bundlesUtils";
@@ -17,8 +17,7 @@ abstract class BundlesModule extends LoginModule
   runningAnalysis = false;
 
   files: string[] = [];
-  serviceAI = http.getServiceAI();
-
+  
   constructor() {
     super();
 
@@ -30,7 +29,30 @@ abstract class BundlesModule extends LoginModule
     this.onAnalyseFinish = this.onAnalyseFinish.bind(this);
     this.onError = this.onError.bind(this);
 
-    this.serviceAI.on(BUNDLE_EVENTS.error, this.onError);
+    this.serviceAI.on(BUNDLE_EVENTS.buildBundleProgress, (processed: number, total: number) => {
+      this.onBuildBundleProgress(processed, total);
+    });
+    this.serviceAI.on(BUNDLE_EVENTS.buildBundleFinish, () => {
+      this.onBuildBundleFinish();
+    });
+    this.serviceAI.on(BUNDLE_EVENTS.uploadBundleProgress, (processed: number, total: number) => {
+      this.onUploadBundleProgress(processed, total);
+    });
+    this.serviceAI.on(BUNDLE_EVENTS.uploadFilesFinish, () => {
+      this.onUploadBundleFinish();
+    });
+    this.serviceAI.on(BUNDLE_EVENTS.analyseProgress, (analysisResults: IQueueAnalysisCheckResult) => {
+      this.onAnalyseProgress(analysisResults);
+    });
+    this.serviceAI.on(
+      BUNDLE_EVENTS.analyseFinish,
+      (analysisResults: IQueueAnalysisCheckResult) => {
+        this.onAnalyseFinish(analysisResults);
+      }
+    );
+    this.serviceAI.on(BUNDLE_EVENTS.error, (error: Error) => {
+      this.onError(error);
+    });
   }
 
   updateStatus(status: string, progress?: number) {
@@ -134,7 +156,10 @@ abstract class BundlesModule extends LoginModule
   // procesing filter list of files, acceptable for server
   public async createFilesFilterList(): Promise<void> {
     try {
-      this.serverFilesFilterList = await http.getFilters(this.baseURL, this.token);
+      this.serverFilesFilterList = await this.serviceAI.getFilters({ 
+        baseURL: this.baseURL,
+        sessionToken: this.token
+      });
     } catch (err) {
       await this.processError(err, {
         message: errorsLogs.filtersFiles
@@ -165,53 +190,35 @@ abstract class BundlesModule extends LoginModule
       this.filesWatcher.activate(this);
     }
 
-    if (!this.token || !this.uploadApproved) {
+    if (!this.token) {
       await this.checkSession();
+      return;
+    }
+    
+    if (!this.uploadApproved) {
       await this.checkApproval();
       return;
     }
 
-    const bundle = await this.startCollectingFiles(path, this.serverFilesFilterList);
+    const bundle = await this.startCollectingFiles(path);
     const removedFiles = (this.files || []).filter(f => !bundle.includes(f));
     this.files = bundle;
 
-    this.serviceAI.on(BUNDLE_EVENTS.buildBundleProgress, (processed: number, total: number) => {
-      this.onBuildBundleProgress(processed, total);
-    });
-    this.serviceAI.on(BUNDLE_EVENTS.buildBundleFinish, () => {
-      this.onBuildBundleFinish();
-    });
-    this.serviceAI.on(BUNDLE_EVENTS.uploadBundleProgress, (processed: number, total: number) => {
-      this.onUploadBundleProgress(processed, total);
-    });
-    this.serviceAI.on(BUNDLE_EVENTS.uploadFilesFinish, () => {
-      this.onUploadBundleFinish();
-    });
-    this.serviceAI.on(BUNDLE_EVENTS.analyseProgress, (analysisResults: IQueueAnalysisCheckResult) => {
-      this.onAnalyseProgress(analysisResults);
-    });
-    this.serviceAI.on(
-      BUNDLE_EVENTS.analyseFinish,
-      (analysisResults: IQueueAnalysisCheckResult) => {
-        this.onAnalyseFinish(analysisResults);
-      }
-    );
-    this.serviceAI.on(BUNDLE_EVENTS.error, (error: Error) => {
-      this.onError(error);
-    });
-
-    http.analyse(this.baseURL, this.token, path, this.files, removedFiles).catch(
+    this.serviceAI.analyse({
+      baseURL: this.baseURL, 
+      sessionToken: this.token, 
+      baseDir: path, 
+      files: this.files, 
+      removedFiles: removedFiles
+    }).catch(
       // no need to wait for processError since catch is called asynchronously as well
       (error) => this.processError(error, {
         message: errorsLogs.analyse
       })
     );
   }
 
-  private async startCollectingFiles(
-    folderPath: string,
-    serverFilesFilterList: DeepCode.AllowedServerFilterListInterface
-  ): Promise<string[]> {
+  private async startCollectingFiles(folderPath: string): Promise<string[]> {
     this.updateStatus(DEEPCODE_ANALYSIS_STATUS.COLLECTING, 0);
     console.log("COLLECTING");
     const bundle = await createListOfDirFiles({

src/deepcode/lib/modules/BundlesModule.ts

@@ -45,8 +45,7 @@ export default class DeepCodeLib extends BundlesModule implements DeepCode.DeepC
     await this.setContext(DEEPCODE_CONTEXT.ERROR, false);
     await this.setLoadingBadge(false);
 
-    const loggedIn = await this.checkSession();
-    if (!loggedIn) return;
+    if (!this.token) return;
     const approved = await this.checkApproval();
     if (!approved) return;
     await this.startAnalysis();

src/deepcode/lib/modules/DeepCodeLib.ts

@@ -1,7 +1,7 @@
 import * as vscode from "vscode";
 import ReportModule from "./ReportModule";
 import DeepCode from "../../../interfaces/DeepCodeInterfaces";
-import http from "../../http/requests";
+
 import { viewInBrowser } from "../../utils/vscodeCommandsUtils";
 import { DEEPCODE_CONTEXT } from "../../constants/views";
 import { openDeepcodeViewContainer } from "../../utils/vscodeCommandsUtils";
@@ -22,7 +22,7 @@ abstract class LoginModule extends ReportModule implements DeepCode.LoginModuleI
     try {
       const checkCurrentToken = await this.checkSession();
       if (checkCurrentToken) return;
-      const result = await http.login(this.baseURL, this.source);
+      const result = await this.serviceAI.startSession({ baseURL: this.baseURL, source: this.source });
       const { sessionToken, loginURL } = result;
       if (!sessionToken || !loginURL) {
         throw new Error(errorsLogs.login);
@@ -43,7 +43,10 @@ abstract class LoginModule extends ReportModule implements DeepCode.LoginModuleI
     let validSession = false;
     if (this.token) {
       try {
-        validSession = !!(await http.checkSession(this.baseURL, this.token));
+        validSession = !!(await this.serviceAI.checkSession({ 
+          baseURL: this.baseURL, 
+          sessionToken: this.token 
+        }));
       } catch (err) {
         await this.processError(err, {
           message: errorsLogs.loginStatus

src/deepcode/lib/modules/LoginModule.ts

@@ -1,5 +1,4 @@
 import DeepCode from "../../../interfaces/DeepCodeInterfaces";
-import http from "../../http/requests";
 import BaseDeepCodeModule from "./BaseDeepCodeModule";
 import { statusCodes } from "../../constants/statusCodes";
 import { errorsLogs } from "../../messages/errorsServerLogMessages";
@@ -24,7 +23,8 @@ abstract class ReportModule extends BaseDeepCodeModule implements DeepCode.Repor
   async sendError(options: {[key: string]: any}): Promise<void> {
     if (!this.shouldReport || !this.shouldReportErrors) return;
     try {
-      await http.sendError(this.baseURL, {
+      await this.serviceAI.reportError({ 
+        baseURL: this.baseURL,
         source: this.source,
         ...(this.token && { sessionToken: this.token }),
         ...options
@@ -37,7 +37,8 @@ abstract class ReportModule extends BaseDeepCodeModule implements DeepCode.Repor
   async sendEvent(event: string, options: {[key: string]: any}): Promise<void> {
     if (!this.shouldReport || !this.shouldReportEvents) return;
     try {
-      await http.sendEvent(this.baseURL, {
+      await this.serviceAI.reportEvent({ 
+        baseURL: this.baseURL, 
         type: event,
         source: this.source,
         ...(this.token && { sessionToken: this.token }),

src/deepcode/lib/modules/ReportModule.ts

@@ -123,7 +123,7 @@ class DeepCodeFilesWatcher implements DeepCode.DeepCodeWatcherInterface {
     type: string
   ): Promise<void> {
     if (
-      !acceptFileToBundle(filePath, extension.serverFilesFilterList) &&
+      !acceptFileToBundle(filePath, extension.serviceAI.serverFilesFilterList) &&
       !isFileChangingBundle(filePath)
     ) {
       return;

src/deepcode/lib/watchers/DeepCodeFilesWatcher.ts

@@ -8,6 +8,8 @@ import {
 } from "vscode";
 import * as vscode from "vscode";
 
+import { IServiceAI } from '@deepcode/tsc';
+
 namespace DeepCode {
   export type userStateItemType = string | number | boolean | undefined;
 
@@ -72,11 +74,6 @@ namespace DeepCode {
     [key: string]: RemoteBundleInterface;
   }
 
-  export interface AllowedServerFilterListInterface {
-    extensions?: Array<string>;
-    configFiles?: Array<string>;
-  }
-
   export interface SingleIssuePositionInterface {
     cols: Array<number>;
     rows: Array<number>;
@@ -164,10 +161,10 @@ namespace DeepCode {
   }
 
   export interface BaseDeepCodeModuleInterface {
+    serviceAI: IServiceAI;
     currentWorkspacePath: string;
     workspacesPaths: Array<string>;
     hashesBundles: HashesBundlesInterface;
-    serverFilesFilterList: AllowedServerFilterListInterface;
     remoteBundles: RemoteBundlesCollectionInterface;
     refreshViewEmitter: vscode.EventEmitter<any>;
     refreshViews(content: any): void;

src/interfaces/DeepCodeInterfaces.ts

@@ -10,8 +10,6 @@ import * as nock from "nock";
 import * as extension from "../../extension";
 import Deepcode from "../../interfaces/DeepCodeInterfaces";
 
-import http from "../../deepcode/http/requests";
-
 // mocked data for tests
 const testHost = "http://localhost:3000";
 const testHostPrefix = "/publicapi";
@@ -124,7 +122,13 @@ suite("Deepcode Extension Tests", () => {
 
   test('Send files list to analyse', async () => {
     try {
-      await http.analyse(testHost, testToken, mockedTestFilesDirPath, testFilesList);
+      await testExtension.serviceAI.analyse({ 
+        baseURL: testHost, 
+        sessionToken: testToken, 
+        baseDir: mockedTestFilesDirPath, 
+        files: testFilesList,
+        removedFiles: []
+      });
       assert.equal(true, true);
     } catch(error) {
       console.log(error);