check

src/main/osinstaller/CxInstaller.ts

@@ -1,13 +1,14 @@
-import * as fsPromises from 'fs/promises';
 import * as fs from 'fs';
 import * as path from 'path';
 import * as tar from 'tar';
 import axios from 'axios';
 import * as unzipper from 'unzipper';
 import {logger} from "../wrapper/loggerConfig";
 import {finished} from 'stream/promises';
+import {promisify} from "node:util";
 
 type SupportedPlatforms = 'win32' | 'darwin' | 'linux';
+const readFileAsync = promisify(fs.readFile);
 
 export class CxInstaller {
     private readonly platform: string;
@@ -70,6 +71,7 @@ export class CxInstaller {
 
             fs.chmodSync(this.getExecutablePath(), 0o755);
             logger.info('Extracted CLI to:', this.resourceDirPath);
+            return Promise.resolve();
         } catch (error) {
             logger.error('Error during installation:', error);
         }
@@ -106,20 +108,24 @@ export class CxInstaller {
     private checkExecutableExists(): boolean {
         return fs.existsSync(this.getExecutablePath());
     }
-
+    
     private async readASTCLIVersion(): Promise<string> {
         if (this.cliVersion) {
             return this.cliVersion;
         }
         try {
-            const versionFilePath = path.join('checkmarx-ast-cli.version');
-            const versionContent = await fsPromises.readFile(versionFilePath, 'utf-8');
-            return versionContent.trim();
+            const versionFilePath = this.getVersionFilePath();
+            const versionContent = await readFileAsync(versionFilePath);
+            return versionContent.toString().trim();
         } catch (error) {
             logger.warn('Error reading AST CLI version: ' + error.message);
             return this.cliDefaultVersion;
         }
     }
+
+    private getVersionFilePath(): string {
+        return path.join(process.cwd(), 'checkmarx-ast-cli.version');
+    }
 
     private getCompressFolderName(): string {
         return `ast-cli.${this.platform === 'win32' ? 'zip' : 'tar.gz'}`;

src/main/wrapper/CxWrapper.ts

@@ -13,10 +13,11 @@ import {Semaphore} from "async-mutex";
 type ParamTypeMap = Map<CxParamType, string>;
 
 export class CxWrapper {
-    private static instances =new Map<string, CxWrapper>(); // Multiton pattern
+    private static instances = new Map<string, CxWrapper>(); // Multiton pattern
     private static semaphore = new Semaphore(1);  // Semaphore with 1 slot
     config: CxConfig;
     cxInstaller: CxInstaller;
+
     private constructor(cxScanConfig: CxConfig, logFilePath?: string) {
         this.cxInstaller = new CxInstaller(process.platform);
         this.config = new CxConfig();
@@ -51,25 +52,29 @@ export class CxWrapper {
 
     static async getInstance(cxScanConfig: CxConfig, logFilePath: string): Promise<CxWrapper> {
         const [, release] = await this.semaphore.acquire();
-        const key = this.generateKey(cxScanConfig, logFilePath);
-        let wrapper = CxWrapper.instances.get(key);
-        if (!wrapper) {
-            wrapper = new CxWrapper(cxScanConfig, logFilePath);
-            CxWrapper.instances.set(key, wrapper);
+        try {
+            const key = this.generateKey(cxScanConfig, logFilePath);
+            let wrapper = CxWrapper.instances.get(key);
+            if (!wrapper) {
+                wrapper = new CxWrapper(cxScanConfig, logFilePath);
+                CxWrapper.instances.set(key, wrapper);
+                await wrapper.init();
+            }
+            return wrapper;
+        } finally {
+            console.log(`Semaphore released by process: ${process.pid}`);
+            release();
         }
-        release();
-
-        return wrapper;
     }
-    
-    static generateKey(config:CxConfig,logFilePath:string): string {
+
+    static generateKey(config: CxConfig, logFilePath: string): string {
         return `${config.baseUri}${config.baseAuthUri}${config.clientId}${config.clientSecret}${config.apiKey}${config.tenant}${config.additionalParameters}${config.pathToExecutable}${logFilePath}`.toLowerCase();
     }
 
     async init(): Promise<void> {
         return await this.cxInstaller.downloadIfNotInstalledCLI();
     }
-    
+
     public cloneWithNewConfig(scanConfig: CxConfig): CxWrapper {
         return new CxWrapper(scanConfig);
     }

src/main/wrapper/CxWrapperFactory.ts

@@ -8,9 +8,7 @@ export interface ICxWrapperFactory {
 
 class CxWrapperFactory implements ICxWrapperFactory {
     async createWrapper(cxScanConfig: CxConfig, logFilePath?: string): Promise<CxWrapper> {
-        const wrapper = await CxWrapper.getInstance(cxScanConfig, logFilePath);
-        await wrapper.init();
-        return wrapper;
+        return await CxWrapper.getInstance(cxScanConfig, logFilePath);
     }
 }