added astClient

Author: BenAlvo1

src/main/client/AstClient.ts

@@ -0,0 +1,29 @@
+import {logger} from '../wrapper/loggerConfig';
+import * as fs from 'fs';
+import {finished} from 'stream/promises';
+import {Client} from "./Client";
+
+export class AstClient {
+    private client: Client;
+
+    constructor(client: Client) {
+        this.client = client;
+    }
+
+    public async downloadFile(url: string, outputPath: string): Promise<void> {
+        logger.info(`Starting download from URL: ${url}`);
+        const writer = fs.createWriteStream(outputPath);
+        try {
+            const response = await this.client.request(url, 'GET', null);
+            response.data.pipe(writer);
+            await finished(writer);
+            logger.info(`Download completed successfully. File saved to: ${outputPath}`);
+        } catch (error) {
+            logger.error(`Error downloading file from ${url}: ${error.message || error}`);
+            throw error;
+        } finally {
+            writer.close();
+            logger.info('Write stream closed.');
+        }
+    }
+}

src/main/client/Client.ts

@@ -1,11 +1,6 @@
+import {AxiosResponse} from "axios";
+
 export interface Client {
-    /**
-     * Downloads a file from the given URL and saves it to the specified output path.
-     *
-     * @param url - The URL to download the file from.
-     * @param outputPath - The path where the downloaded file will be saved.
-     * @throws An error if the download fails.
-     */
-    downloadFile(url: string, outputPath: string): Promise<void>;
     getProxyConfig(): any;
+    request(url: string, method: string, data: any): Promise<AxiosResponse<any, any>>;
 }

src/main/client/HttpClient.ts

@@ -1,7 +1,5 @@
-import axios, {AxiosRequestConfig} from 'axios';
+import axios, {AxiosRequestConfig, AxiosResponse} from 'axios';
 import {logger} from '../wrapper/loggerConfig';
-import * as fs from 'fs';
-import {finished} from 'stream/promises';
 import {Client} from "./Client";
 
 export class HttpClient implements Client {
@@ -32,28 +30,22 @@ export class HttpClient implements Client {
         logger.info('No proxy configuration detected.');
         return undefined;
     }
-
-    public async downloadFile(url: string, outputPath: string): Promise<void> {
-        logger.info(`Starting download from URL: ${url}`);
-        const writer = fs.createWriteStream(outputPath);
-
+    
+    public async request(url: string, method: string, data: any): Promise<AxiosResponse<any, any>> {
+        logger.info(`Sending ${method} request to URL: ${url}`);
+        if (this.axiosConfig.proxy) {
+            logger.info(
+                `Using proxy - Host: ${this.axiosConfig.proxy.host}, Port: ${this.axiosConfig.proxy.port},`  +
+                `Protocol: ${this.axiosConfig.proxy.protocol}, Auth: ${this.axiosConfig.proxy.auth ? 'Yes' : 'No'}`
+            );
+        }
         try {
-            if (this.axiosConfig.proxy) {
-                logger.info(
-                    `Using proxy - Host: ${this.axiosConfig.proxy.host}, Port: ${this.axiosConfig.proxy.port},`  +
-                    `Protocol: ${this.axiosConfig.proxy.protocol}, Auth: ${this.axiosConfig.proxy.auth ? 'Yes' : 'No'}`
-                );
-            }
-            const response = await axios({...this.axiosConfig, url});
-            response.data.pipe(writer);
-            await finished(writer);
-            logger.info(`Download completed successfully. File saved to: ${outputPath}`);
+            const response = await axios({...this.axiosConfig, url, method, data});
+            logger.info(`Request completed successfully.`);
+            return response;
         } catch (error) {
-            logger.error(`Error downloading file from ${url}: ${error.message || error}`);
+            logger.error(`Error sending ${method} request to ${url}: ${error.message || error}`);
             throw error;
-        } finally {
-            writer.close();
-            logger.info('Write stream closed.');
         }
     }
 }

src/main/osinstaller/CxInstaller.ts

@@ -4,7 +4,7 @@ import * as path from 'path';
 import * as tar from 'tar';
 import * as unzipper from 'unzipper';
 import {logger} from "../wrapper/loggerConfig";
-import {Client} from "../client/Client";
+import {AstClient} from "../client/AstClient";
 
 const linuxOS = 'linux';
 const macOS = 'darwin';
@@ -22,15 +22,15 @@ export class CxInstaller {
     private readonly resourceDirPath: string;
     private readonly installedCLIVersionFileName = 'cli-version';
     private readonly cliDefaultVersion = '2.2.5'; // Update this with the latest version.
-    private readonly client: Client;
+    private readonly client: AstClient;
 
     private static readonly PLATFORMS: Record<SupportedPlatforms, PlatformData> = {
         win32: { platform: 'windows', extension: 'zip' },
         darwin: { platform: macOS, extension: 'tar.gz' },
         linux: { platform: linuxOS, extension: 'tar.gz' }
     };
 
-    constructor(platform: string, client: Client) {
+    constructor(platform: string, client: AstClient) {
         this.platform = platform as SupportedPlatforms;
         this.resourceDirPath = path.join(__dirname, '../wrapper/resources');
         this.client = client;

src/main/wrapper/CxWrapper.ts

@@ -9,6 +9,7 @@ import CxBFL from "../bfl/CxBFL";
 import {CxInstaller} from "../osinstaller/CxInstaller";
 import {Semaphore} from "async-mutex";
 import {HttpClient} from "../client/HttpClient";
+import {AstClient} from "../client/AstClient";
 
 
 type ParamTypeMap = Map<CxParamType, string>;
@@ -19,7 +20,7 @@ export class CxWrapper {
     config: CxConfig;
     cxInstaller: CxInstaller;
     private constructor(cxScanConfig: CxConfig, logFilePath?: string) {
-        this.cxInstaller = new CxInstaller(process.platform, new HttpClient());
+        this.cxInstaller = new CxInstaller(process.platform, new AstClient(new HttpClient()));
         this.config = new CxConfig();
         getLoggerWithFilePath(logFilePath)
         if (cxScanConfig.apiKey) {

src/tests/CxInstallerTest.test.ts

@@ -1,13 +1,15 @@
 import { CxInstaller } from "../main/osinstaller/CxInstaller";
 import { anyString, mock, instance, when, verify } from "ts-mockito";
-import { HttpClient } from "../main/client/HttpClient";
+import { AstClient } from "../main/client/AstClient";
 
-const clientMock = mock(HttpClient);
-const clientMockInstance = instance(clientMock);
+// Mock AstClient and set up an instance from it
+const astClientMock = mock(AstClient);
+const astClientInstance = instance(astClientMock);
 
-const cxInstallerLinux = new CxInstaller("linux", clientMockInstance);
-const cxInstallerMac = new CxInstaller("darwin", clientMockInstance);
-const cxInstallerWindows = new CxInstaller("win32", clientMockInstance);
+// Create CxInstaller instances with the mocked AstClient
+const cxInstallerLinux = new CxInstaller("linux", astClientInstance);
+const cxInstallerMac = new CxInstaller("darwin", astClientInstance);
+const cxInstallerWindows = new CxInstaller("win32", astClientInstance);
 
 describe("CxInstaller cases", () => {
     it('CxInstaller getDownloadURL Linux Successful case', async () => {
@@ -48,16 +50,12 @@ describe("CxInstaller getExecutablePath cases", () => {
 
 describe("CxInstaller checkExecutableExists cases", () => {
     beforeAll(async () => {
-        // Set up mock behavior
-        when(clientMock.downloadFile(anyString(), anyString())).thenResolve();
-
-        // Trigger the download
+        when(astClientMock.downloadFile(anyString(), anyString())).thenResolve(); // Set up mock behavior here
         await cxInstallerWindows.downloadIfNotInstalledCLI();
     });
 
     it('CxInstaller checkExecutableExists Windows Successful case', () => {
-        // Verify if downloadFile was called with the expected arguments
-        verify(clientMock.downloadFile(anyString(), anyString())).called();
+        verify(astClientMock.downloadFile(anyString(), anyString())).called();
     });
 });
 
@@ -72,4 +70,4 @@ function getArchitecture(platform: string): string {
     };
 
     return archMap[process.arch] || 'x64';
-}
+}