Using a buffer instead of filestream

Author: akshita31

src/omnisharp/OmnisharpDownloader.ts

@@ -49,8 +49,8 @@ export class OmnisharpDownloader {
         try {
             this.eventStream.post(new LatestBuildDownloadStart());
             tmpFile = await CreateTmpFile();
-            await DownloadFile(tmpFile.fd, description, this.eventStream, this.networkSettingsProvider, url);
-            return fs.readFileSync(tmpFile.name, 'utf8');
+            let versionBuffer = await DownloadFile(tmpFile.fd, description, this.eventStream, this.networkSettingsProvider, url);
+            return versionBuffer.toString('utf8');
         }
         catch (error) {
             this.eventStream.post(new InstallationFailure('getLatestVersionInfoFile', error));

src/packageManager/FileDownloader.ts

@@ -5,7 +5,6 @@
 
 import * as https from 'https';
 import * as util from '../common';
-import * as fs from 'fs';
 import { EventStream } from "../EventStream";
 import { DownloadSuccess, DownloadStart, DownloadFallBack, DownloadFailure, DownloadProgress, DownloadSizeObtained } from "../omnisharp/loggingEvents";
 import { NestedError } from "../NestedError";
@@ -17,8 +16,9 @@ export async function DownloadFile(destinationFileDescriptor: number, descriptio
     eventStream.post(new DownloadStart(description));
 
     try {
-        await downloadFile(destinationFileDescriptor, description, url, eventStream, networkSettingsProvider);
+        let buffer = await downloadFile(destinationFileDescriptor, description, url, eventStream, networkSettingsProvider);
         eventStream.post(new DownloadSuccess(` Done!`));
+        return buffer;
     }
     catch (primaryUrlError) {
         // If the package has a fallback Url, and downloading from the primary Url failed, try again from 
@@ -27,8 +27,9 @@ export async function DownloadFile(destinationFileDescriptor: number, descriptio
         if (fallbackUrl) {
             eventStream.post(new DownloadFallBack(fallbackUrl));
             try {
-                await downloadFile(destinationFileDescriptor, description, fallbackUrl, eventStream, networkSettingsProvider);
+                let buffer = await downloadFile(destinationFileDescriptor, description, fallbackUrl, eventStream, networkSettingsProvider);
                 eventStream.post(new DownloadSuccess(' Done!'));
+                return buffer;
             }
             catch (fallbackUrlError) {
                 throw primaryUrlError;
@@ -40,7 +41,7 @@ export async function DownloadFile(destinationFileDescriptor: number, descriptio
     }
 }
 
-async function downloadFile(fd: number, description: string, urlString: string, eventStream: EventStream, networkSettingsProvider: NetworkSettingsProvider): Promise<void> {
+async function downloadFile(fd: number, description: string, urlString: string, eventStream: EventStream, networkSettingsProvider: NetworkSettingsProvider): Promise<Buffer> {
     const url = parseUrl(urlString);
     const networkSettings = networkSettingsProvider();
     const proxy = networkSettings.proxy;
@@ -53,7 +54,9 @@ async function downloadFile(fd: number, description: string, urlString: string,
         rejectUnauthorized: util.isBoolean(strictSSL) ? strictSSL : true
     };
 
-    return new Promise<void>((resolve, reject) => {
+    let buffers: any[] = [];
+
+    return new Promise<Buffer>((resolve, reject) => {
         if (fd == 0) {
             reject(new NestedError("Temporary package file unavailable"));
         }
@@ -74,12 +77,13 @@ async function downloadFile(fd: number, description: string, urlString: string,
             let packageSize = parseInt(response.headers['content-length'], 10);
             let downloadedBytes = 0;
             let downloadPercentage = 0;
-            let tmpFile = fs.createWriteStream(null, { fd });
+            //let tmpFile = fs.createWriteStream(null, { fd });
 
             eventStream.post(new DownloadSizeObtained(packageSize));
 
             response.on('data', data => {
                 downloadedBytes += data.length;
+                buffers.push(data);
 
                 // Update status bar item with percentage
                 let newPercentage = Math.ceil(100 * (downloadedBytes / packageSize));
@@ -90,15 +94,15 @@ async function downloadFile(fd: number, description: string, urlString: string,
             });
 
             response.on('end', () => {
-                resolve();
+                resolve(Buffer.concat(buffers));
             });
 
             response.on('error', err => {
                 reject(new NestedError(`Reponse error: ${err.message || 'NONE'}`, err));
             });
 
             // Begin piping data from the response to the package file
-            response.pipe(tmpFile, { end: false });
+           // response.pipe(tmpFile, { end: false });
         });
 
         request.on('error', err => {

src/packageManager/PackageManager.ts

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

src/packageManager/ZipInstaller.ts

@@ -11,15 +11,15 @@ import { EventStream } from "../EventStream";
 import { InstallationStart } from "../omnisharp/loggingEvents";
 import { NestedError } from '../NestedError';
 
-export async function InstallZip(sourceFileDescriptor: number, description: string, destinationInstallPath: string, binaries: string[], eventStream: EventStream): Promise<void> {
+export async function InstallZip(buffer: Buffer, description: string, destinationInstallPath: string, binaries: string[], eventStream: EventStream): Promise<void> {
     eventStream.post(new InstallationStart(description));
 
     return new Promise<void>((resolve, reject) => {
-        if (sourceFileDescriptor == 0) {
+        /*if (sourceFileDescriptor == 0) {
             return reject(new NestedError('Downloaded file unavailable'));
-        }
+        }*/
 
-        yauzl.fromFd(sourceFileDescriptor, { lazyEntries: true }, (err, zipFile) => {
+        yauzl.fromBuffer(buffer, { lazyEntries: true }, (err, zipFile) => {
             if (err) {
                 return reject(new NestedError('Immediate zip file error', err));
             }