Add logic for retry

Author: akshita31

src/observers/CsharpChannelObserver.ts

@@ -4,12 +4,13 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { BaseChannelObserver } from "./BaseChannelObserver";
-import { BaseEvent, InstallationFailure, DebuggerNotInstalledFailure, DebuggerPrerequisiteFailure, ProjectJsonDeprecatedWarning, PackageInstallStart } from "../omnisharp/loggingEvents";
+import { BaseEvent, InstallationFailure, DebuggerNotInstalledFailure, DebuggerPrerequisiteFailure, ProjectJsonDeprecatedWarning, PackageInstallStart, CorruptedDownloadError } from "../omnisharp/loggingEvents";
 
 export class CsharpChannelObserver extends BaseChannelObserver {
     public post = (event: BaseEvent) => {
         switch (event.constructor.name) {
             case PackageInstallStart.name:
+            case CorruptedDownloadError.name:
                 this.showChannel(true);
                 break;
             case InstallationFailure.name:

src/observers/CsharpLoggerObserver.ts

@@ -58,9 +58,23 @@ export class CsharpLoggerObserver extends BaseLoggerObserver {
             case Event.LatestBuildDownloadStart.name:
                 this.logger.appendLine("Getting latest OmniSharp version information");
                 break;
+            case Event.DownloadRetry.name:
+                this.handleDownloadRetry(<Event.DownloadRetry>event);
+                break;
+            case Event.CorruptedDownloadError.name:
+                this.handleCorruptedDownloadError(<Event.CorruptedDownloadError>event);
+                break;
         }
     }
 
+    private handleCorruptedDownloadError(event: Event.CorruptedDownloadError){
+        this.logger.appendLine(`There was a problem downloading ${event.packageDescription}. Some functionalities may not work as expected. Please restart vscode to retrigger the download or download the package manually from ${event.url}`); 
+    }
+
+    private handleDownloadRetry(event: Event.DownloadRetry) {
+        this.logger.appendLine(`Corrupt download obtained for package ${event.packageDescription}. Retrying..`);
+    }
+
     private handleDownloadSizeObtained(event: Event.DownloadSizeObtained) {
         this.logger.append(`(${Math.ceil(event.packageSize / 1024)} KB)`);
     }

src/observers/ErrorMessageObserver.ts

@@ -3,12 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { BaseEvent, ZipError, DotNetTestRunFailure, DotNetTestDebugStartFailure } from "../omnisharp/loggingEvents";
+import { BaseEvent, ZipError, DotNetTestRunFailure, DotNetTestDebugStartFailure, CorruptedDownloadError } from "../omnisharp/loggingEvents";
 import { vscode } from "../vscodeAdapter";
 import showErrorMessage from "./utils/ShowErrorMessage";
 
 export class ErrorMessageObserver {
-
     constructor(private vscode: vscode) {
     }
 
@@ -23,9 +22,15 @@ export class ErrorMessageObserver {
             case DotNetTestDebugStartFailure.name:
                 this.handleDotNetTestDebugStartFailure(<DotNetTestDebugStartFailure>event);
                 break;
+            case CorruptedDownloadError.name:
+                this.handleCorruptedDownloadError(<CorruptedDownloadError> event);
         }
     }
 
+    handleCorruptedDownloadError(event: CorruptedDownloadError): any {
+        showErrorMessage(this.vscode, `There was a problem downloading ${event.packageDescription}. Some functionalities may not work as expected. Please restart vscode to retrigger the download or download the package manually from ${event.url}`);
+    }
+
     private handleZipError(event: ZipError) {
         showErrorMessage(this.vscode, event.message);
     }

src/omnisharp/loggingEvents.ts

@@ -162,6 +162,14 @@ export class OpenURL {
     constructor(public url: string) { }
 }
 
+export class DownloadRetry {
+    constructor(public packageDescription: string){ }
+}
+
+export class CorruptedDownloadError {
+    constructor(public packageDescription: string, public url: string){ }
+}
+
 export class RazorPluginPathSpecified implements BaseEvent {
     constructor(public path: string) {}
 }

src/packageManager/downloadAndInstallPackages.ts

@@ -11,7 +11,7 @@ import { EventStream } from '../EventStream';
 import { NetworkSettingsProvider } from "../NetworkSettings";
 import { AbsolutePathPackage } from "./AbsolutePathPackage";
 import { touchInstallFile, InstallFileType, deleteInstallFile, installFileExists } from "../common";
-import { InstallationFailure } from "../omnisharp/loggingEvents";
+import { InstallationFailure, DownloadRetry, CorruptedDownloadError } from "../omnisharp/loggingEvents";
 import { mkdirpSync } from "fs-extra";
 import { PackageInstallStart } from "../omnisharp/loggingEvents";
 import { isValidDownload } from './isValidInstallation';
@@ -24,12 +24,25 @@ export async function downloadAndInstallPackages(packages: AbsolutePathPackage[]
             try {
                 mkdirpSync(pkg.installPath.value);
                 await touchInstallFile(pkg.installPath, InstallFileType.Begin);
-                installationStage = 'downloadAndInstallPackages';
-                let buffer = await DownloadFile(pkg.description, eventStream, provider, pkg.url, pkg.fallbackUrl);
-                if (await isValidDownload(buffer, pkg.integrity)) {
-                    await InstallZip(buffer, pkg.description, pkg.installPath, pkg.binaries, eventStream);
-                    installationStage = 'touchLockFile';
-                    await touchInstallFile(pkg.installPath, InstallFileType.Lock);
+                let count = 0;
+                while (count < 2) {
+                    count++;
+                    let buffer = await DownloadFile(pkg.description, eventStream, provider, pkg.url, pkg.fallbackUrl);
+                    if (await isValidDownload(buffer, pkg.integrity)) {
+                        await InstallZip(buffer, pkg.description, pkg.installPath, pkg.binaries, eventStream);
+                        installationStage = 'touchLockFile';
+                        await touchInstallFile(pkg.installPath, InstallFileType.Lock);
+                        break;
+                    }
+                    else {
+                        if (count == 1) {
+                            eventStream.post(new DownloadRetry(pkg.description));
+                        }
+                        else {
+                            eventStream.post(new CorruptedDownloadError(pkg.description, pkg.url));
+                            break;
+                        }
+                    }
                 }
             }
             catch (error) {