CLean up the temporary files

Author: akshita31

src/omnisharp/OmnisharpDownloader.ts

@@ -3,14 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as fs from 'fs';
 import { GetPackagesFromVersion } from './OmnisharpPackageCreator';
 import { PlatformInformation } from '../platform';
 import { PackageInstallation, LogPlatformInfo, InstallationSuccess, InstallationFailure, LatestBuildDownloadStart } from './loggingEvents';
 import { EventStream } from '../EventStream';
 import { NetworkSettingsProvider } from '../NetworkSettings';
 import { DownloadAndInstallPackages } from '../packageManager/PackageManager';
-import { CreateTmpFile, TmpAsset } from '../CreateTmpAsset';
 import { DownloadFile } from '../packageManager/FileDownloader';
 import { ResolveFilePaths } from '../packageManager/PackageFilePathResolver';
 
@@ -45,21 +43,14 @@ export class OmnisharpDownloader {
     public async GetLatestVersion(serverUrl: string, latestVersionFileServerPath: string): Promise<string> {
         let description = "Latest Omnisharp Version Information";
         let url = `${serverUrl}/${latestVersionFileServerPath}`;
-        let tmpFile: TmpAsset;
         try {
             this.eventStream.post(new LatestBuildDownloadStart());
-            tmpFile = await CreateTmpFile();
-            let versionBuffer = await DownloadFile(tmpFile.fd, description, this.eventStream, this.networkSettingsProvider, url);
+            let versionBuffer = await DownloadFile(description, this.eventStream, this.networkSettingsProvider, url);
             return versionBuffer.toString('utf8');
         }
         catch (error) {
             this.eventStream.post(new InstallationFailure('getLatestVersionInfoFile', error));
             throw error;
         }
-        finally {
-            if (tmpFile) {
-                tmpFile.dispose();
-            }
-        }
     }
 }

src/packageManager/FileDownloader.ts

@@ -12,11 +12,11 @@ import { parse as parseUrl } from 'url';
 import { getProxyAgent } from './proxy';
 import { NetworkSettingsProvider } from '../NetworkSettings';
 
-export async function DownloadFile(destinationFileDescriptor: number, description: string, eventStream: EventStream, networkSettingsProvider: NetworkSettingsProvider, url: string, fallbackUrl?: string){
+export async function DownloadFile(description: string, eventStream: EventStream, networkSettingsProvider: NetworkSettingsProvider, url: string, fallbackUrl?: string){
     eventStream.post(new DownloadStart(description));
 
     try {
-        let buffer = await downloadFile(destinationFileDescriptor, description, url, eventStream, networkSettingsProvider);
+        let buffer = await downloadFile(description, url, eventStream, networkSettingsProvider);
         eventStream.post(new DownloadSuccess(` Done!`));
         return buffer;
     }
@@ -27,7 +27,7 @@ export async function DownloadFile(destinationFileDescriptor: number, descriptio
         if (fallbackUrl) {
             eventStream.post(new DownloadFallBack(fallbackUrl));
             try {
-                let buffer = await downloadFile(destinationFileDescriptor, description, fallbackUrl, eventStream, networkSettingsProvider);
+                let buffer = await downloadFile(description, fallbackUrl, eventStream, networkSettingsProvider);
                 eventStream.post(new DownloadSuccess(' Done!'));
                 return buffer;
             }
@@ -41,7 +41,7 @@ export async function DownloadFile(destinationFileDescriptor: number, descriptio
     }
 }
 
-async function downloadFile(fd: number, description: string, urlString: string, eventStream: EventStream, networkSettingsProvider: NetworkSettingsProvider): Promise<Buffer> {
+async function downloadFile(description: string, urlString: string, eventStream: EventStream, networkSettingsProvider: NetworkSettingsProvider): Promise<Buffer> {
     const url = parseUrl(urlString);
     const networkSettings = networkSettingsProvider();
     const proxy = networkSettings.proxy;
@@ -57,14 +57,10 @@ async function downloadFile(fd: number, description: string, urlString: string,
     let buffers: any[] = [];
 
     return new Promise<Buffer>((resolve, reject) => {
-        if (fd == 0) {
-            reject(new NestedError("Temporary package file unavailable"));
-        }
-
         let request = https.request(options, response => {
             if (response.statusCode === 301 || response.statusCode === 302) {
                 // Redirect - download from new location
-                return resolve(downloadFile(fd, description, response.headers.location, eventStream, networkSettingsProvider));
+                return resolve(downloadFile(description, response.headers.location, eventStream, networkSettingsProvider));
             }
 
             else if (response.statusCode != 200) {

src/packageManager/PackageManager.ts

@@ -23,7 +23,7 @@ export async function DownloadAndInstallPackages(packages: Package[], provider:
         for (let pkg of filteredPackages) {
             try {
                 tmpFile = await CreateTmpFile();
-                let buffer = await DownloadFile(tmpFile.fd, pkg.description, eventStream, provider, pkg.url, pkg.fallbackUrl);
+                let buffer = await DownloadFile(pkg.description, eventStream, provider, pkg.url, pkg.fallbackUrl);
                 await InstallZip(buffer, pkg.description, pkg.installPath, pkg.binaries, eventStream);
             }
             catch (error) {

src/packageManager/ZipInstaller.ts

@@ -15,10 +15,6 @@ export async function InstallZip(buffer: Buffer, description: string, destinatio
     eventStream.post(new InstallationStart(description));
 
     return new Promise<void>((resolve, reject) => {
-        /*if (sourceFileDescriptor == 0) {
-            return reject(new NestedError('Downloaded file unavailable'));
-        }*/
-
         yauzl.fromBuffer(buffer, { lazyEntries: true }, (err, zipFile) => {
             if (err) {
                 return reject(new NestedError('Immediate zip file error', err));