remove unnecessary request handling

microsoft · Feb 5, 2025 · 475ba2b · 475ba2b
1 parent 1300386
commit 475ba2b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 26 deletions.
diff --git a/vscode/microsoft-kiota/src/kiotaInterop/install.ts b/vscode/microsoft-kiota/src/kiotaInterop/install.ts
@@ -1,8 +1,8 @@
 import AdmZip from 'adm-zip';
+import appdataPath from 'appdata-path';
+import { https } from "follow-redirects";
 import * as fs from 'fs';
-import * as https from 'https';
 import * as path from 'path';
-import appdataPath from 'appdata-path';
 
 import runtimeJson from './runtime.json';
 
@@ -104,28 +104,32 @@ function unzipFile(zipFilePath: string, destinationPath: string) {
   zip.extractAllTo(destinationPath, true);
 }
 
-function downloadFileFromUrl(url: string, destinationPath: string) {
+function downloadFileFromUrl(url: string, destinationPath: string): Promise<void> {
   return new Promise((resolve, reject) => {
+    const file = fs.createWriteStream(destinationPath);
     const request = https.get(url, (response) => {
       if (response.statusCode && response.statusCode >= 300 && response.statusCode < 400 && response.headers.location) {
         resolve(downloadFileFromUrl(response.headers.location, destinationPath));
       } else if (response.statusCode && response.statusCode >= 200 && response.statusCode < 300) {
-        const filePath = fs.createWriteStream(destinationPath);
-        response.pipe(filePath);
-        filePath.on('finish', () => {
-          filePath.close();
-          resolve(undefined);
-        });
-        filePath.on('error', (err) => {
-          fs.unlink(destinationPath, () => reject(err));
+        response.pipe(file);
+        file.on("finish", () => {
+          file.close((err) => {
+            if (err) {
+              reject(err);
+            } else {
+              resolve();
+            }
+          });
         });
       } else {
         reject(new Error(`Failed to download file: ${response.statusCode}`));
       }
     });
-    request.on('error', (err) => {
-      reject(err);
+
+    request.on("error", (err) => {
+      fs.unlink(destinationPath, () => reject(err));
     });
+
     request.end();
   });
 }

diff --git a/vscode/microsoft-kiota/src/kiotaInterop/tests/getKiotaVersion.spec.ts b/vscode/microsoft-kiota/src/kiotaInterop/tests/getKiotaVersion.spec.ts
@@ -1,21 +1,8 @@
 import { getKiotaVersion } from "../getKiotaVersion";
-import { https } from "follow-redirects";
 
 jest.setTimeout(60000);
 
 describe("getKiotaVersion", () => {
-  let request: ReturnType<typeof https.get> | undefined;
-
-  beforeEach(() => {
-    request = undefined;
-  });
-
-  afterEach(() => {
-    if (request) {
-      request.destroy();
-    }
-  });
-
   test("should return version when successful", async () => {
     const version = await getKiotaVersion();
     expect(version).toBeDefined();