fix proxy handeler and add unit test

Author: cx-itay-paz

.github/workflows/ci.yml

@@ -1,26 +1,38 @@
 name: AST Javascript wrapper CI
 
-on: [pull_request]
+on: [ pull_request ]
 jobs:
+  unit-tests:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: Use Node.js 22.11.0
+      uses: actions/[email protected]
+      with:
+        node-version: 22.11.0
+        registry-url: https://npm.pkg.github.com/
+    - run: npm ci
+    - name: Run Unit Tests
+      run: npm run test:unit
   integration-tests:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - name: Use Node.js 22.11.0
-        uses: actions/[email protected]
-        with:
-          node-version: 22.11.0
-          registry-url: https://npm.pkg.github.com/
-      - run: npm ci
-      - name: Code Linting
-        run: npm run lint
-      - run: npm run build --if-present
+    - uses: actions/checkout@v4
+    - name: Use Node.js 22.11.0
+      uses: actions/[email protected]
+      with:
+        node-version: 22.11.0
+        registry-url: https://npm.pkg.github.com/
+    - run: npm ci
+    - name: Code Linting
+      run: npm run lint
+    - run: npm run build --if-present
 
-      - name: Run tests
-        env:
-          CX_CLIENT_ID: ${{ secrets.CX_CLIENT_ID}}
-          CX_CLIENT_SECRET: ${{ secrets.CX_CLIENT_SECRET}}
-          CX_BASE_URI: ${{ secrets.CX_BASE_URI }}
-          CX_TENANT: ${{ secrets.CX_TENANT }}
-          CX_APIKEY: ${{ secrets.CX_APIKEY }}
-        run: npm test
+    - name: Run tests
+      env:
+        CX_CLIENT_ID: ${{ secrets.CX_CLIENT_ID}}
+        CX_CLIENT_SECRET: ${{ secrets.CX_CLIENT_SECRET}}
+        CX_BASE_URI: ${{ secrets.CX_BASE_URI }}
+        CX_TENANT: ${{ secrets.CX_TENANT }}
+        CX_APIKEY: ${{ secrets.CX_APIKEY }}
+      run: npm test

jest.config.js

@@ -28,7 +28,7 @@ module.exports = {
   // preset configs
   // preset: 'ts-jest/presets/js-with-ts',
   // which files to test and which to ignore
-  testMatch: ['**/src/tests/*.test.(ts|tsx)'],
+  testMatch: ['**/src/tests/**/*.test.(ts|tsx)'],
   testPathIgnorePatterns: ['/node_modules/', '/tmp/', '/coverage/', '/stories/', '/\\.storybook/'],
   // don't watch for file changes in node_modules
   watchPathIgnorePatterns: ['/node_modules/'],

package.json

@@ -23,7 +23,8 @@
     "postbuild": "copyfiles -u 1 src/tests/data/* dist/;",
     "lint": "eslint . --ext .ts",
     "lint-and-fix": "eslint . --ext .ts --fix",
-    "test": "copyfiles -u 1 src/tests/data/* dist/; tsc && jest --runInBand"
+    "test": "copyfiles -u 1 src/tests/data/* dist/; tsc && jest --runInBand",
+    "test:unit": "tsc && jest --runInBand --testPathPattern=tests/unit"
   },
   "repository": "https://github.com/CheckmarxDev/ast-cli-javascript-wrapper-runtime-cli.git",
   "author": "Jay Nanduri",

src/main/client/AstClient.ts

@@ -19,7 +19,8 @@ export class AstClient {
 
         try {
             const proxyUrl = new URL(proxyEnv);
-            if (proxyUrl.port === '') {
+            const proxyPort = proxyUrl.port || (proxyUrl.protocol === 'http:' ? '80' : proxyUrl.protocol === 'https:' ? '443' : '');
+            if (proxyPort === '') {
                 logger.error(`Invalid proxy URL: ${proxyUrl}. Port is missing. Proceeding without proxy agent.`);
                 return undefined;
             }
@@ -31,12 +32,12 @@ export class AstClient {
             const agent = tunnel.httpsOverHttp({
                 proxy: {
                     host: proxyUrl.hostname,
-                    port: Number(proxyUrl.port),
+                    port: Number(proxyPort),
                     proxyAuth,
                 }
             });
 
-            logger.info(`Using proxy agent for host: ${proxyUrl.hostname} and port: ${proxyUrl.port}`);
+            logger.info(`Using proxy agent for host: ${proxyUrl.hostname} and port: ${proxyPort}`);
 
             return {
                 prepareRequest: (options: any): any => {

src/tests/unit/AstClientCreateProxyRequestHandler.test.ts

@@ -0,0 +1,68 @@
+import { AstClient } from "../../main/client/AstClient";
+
+describe("AstClient - createProxyRequestHandler", () => {
+    const OLD_ENV = process.env;
+
+    beforeEach(() => {
+        jest.resetModules();
+        process.env = { ...OLD_ENV };
+    });
+
+    afterAll(() => {
+        process.env = OLD_ENV;
+    });
+
+    it("should return proxy with default port 80 when HTTP_PROXY is http without port", () => {
+        process.env.HTTP_PROXY = "http://31.220.15.234:80";
+
+        const client = new AstClient();
+        const handler = (client as any).createProxyRequestHandler();
+
+        expect(handler).toBeDefined();
+    });
+
+    it("should return proxy with default port 443 when HTTP_PROXY is https without port", () => {
+        process.env.HTTP_PROXY = "https://31.220.15.234:443";
+
+        const client = new AstClient();
+        const handler = (client as any).createProxyRequestHandler();
+
+        expect(handler).toBeDefined();
+    });
+
+    it("should return undefined when HTTP_PROXY is empty", () => {
+        delete process.env.HTTP_PROXY;
+
+        const client = new AstClient();
+        const handler = (client as any).createProxyRequestHandler();
+
+        expect(handler).toBeUndefined();
+    });
+
+    it("should return undefined when HTTP_PROXY is invalid protocol", () => {
+        process.env.HTTP_PROXY = "ftp://31.220.15.234";
+
+        const client = new AstClient();
+        const handler = (client as any).createProxyRequestHandler();
+
+        expect(handler).toBeUndefined();
+    });
+
+    it("should use default port 80 when HTTP_PROXY is http without port", () => {
+        process.env.HTTP_PROXY = "http://31.220.15.234"; // ללא פורט מפורש
+
+        const client = new AstClient();
+        const handler = (client as any).createProxyRequestHandler();
+
+        expect(handler).toBeDefined();
+    });
+
+    it("should use default port 443 when HTTP_PROXY is https without port", () => {
+        process.env.HTTP_PROXY = "https://31.220.15.234"; // ללא פורט מפורש
+
+        const client = new AstClient();
+        const handler = (client as any).createProxyRequestHandler();
+
+        expect(handler).toBeDefined();
+    });
+});