Merge branch 'next'

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brightsec/cli",
-  "version": "12.5.0",
+  "version": "12.6.0-next.1",
   "private": false,
   "repository": {
     "type": "git",

src/Config/CliBuilder.ts

@@ -4,6 +4,7 @@ import { SystemConfigManager } from './SystemConfigManager';
 import { CliInfo } from './CliInfo';
 import { Arguments, Argv, CommandModule } from 'yargs';
 import { init, runWithAsyncContext, setContext } from '@sentry/node';
+import ms from 'ms';
 
 export interface CliBuilderOptions {
   info: CliInfo;
@@ -75,11 +76,17 @@ export class CliBuilder {
           'Specify a proxy URL to route all inbound traffic through. For more information, see the --proxy option.'
       })
       .option('timeout', {
-        describe: 'Request timeout in seconds',
+        describe:
+          'Request timeout in seconds or a duration string (e.g. 10s, 1m, 1h, 10h, 1y).',
         default: 30,
-        type: 'number',
-        coerce(arg: number) {
-          return arg * 1000;
+        coerce(arg: string) {
+          // if arg is not a number, then it's a duration string
+          // convert duration string to milliseconds
+          if (isNaN(+arg)) {
+            return ms(arg);
+          }
+
+          return +arg * 1000;
         }
       })
       .conflicts({

src/Scan/BasePolling.ts

@@ -3,7 +3,6 @@ import { Polling } from './Polling';
 import { Breakpoint } from './Breakpoint';
 import { Backoff, logger } from '../Utils';
 import { PollingConfig } from './PollingFactory';
-import ms from 'ms';
 import axios from 'axios';
 import { ok } from 'node:assert';
 
@@ -33,9 +32,7 @@ export class BasePolling implements Polling {
     }
 
     if (this.options.interval) {
-      const interval = this.toMilliseconds(this.options.interval);
-
-      if (interval < this.defaultInterval) {
+      if (this.options.interval < this.defaultInterval) {
         logger.warn(`Warning: polling interval is too small.`);
         logger.warn(`The recommended way to set polling interval to 10s.`);
       }
@@ -69,13 +66,9 @@ export class BasePolling implements Polling {
     clearTimeout(this.timeoutDescriptor);
   }
 
-  private setTimeout(timeout: number | string = this.options.timeout): void {
-    const timeoutInMs: number = this.toMilliseconds(timeout);
-    this.timeoutDescriptor = setTimeout(
-      () => (this._active = false),
-      timeoutInMs
-    );
-    logger.debug(`The polling timeout has been set to %d ms.`, timeoutInMs);
+  private setTimeout(timeout: number = this.options.timeout): void {
+    this.timeoutDescriptor = setTimeout(() => (this._active = false), timeout);
+    logger.debug(`The polling timeout has been set to %d ms.`, timeout);
   }
 
   private async *poll(): AsyncIterableIterator<ScanState> {
@@ -96,19 +89,6 @@ export class BasePolling implements Polling {
     }
   }
 
-  private toMilliseconds(time: string | number): number {
-    if (typeof time === 'string') {
-      const milliseconds = ms(time);
-      if (!milliseconds) {
-        return;
-      }
-
-      return milliseconds;
-    } else if (typeof time === 'number') {
-      return time;
-    }
-  }
-
   private isRedundant(status: ScanStatus): boolean {
     return (
       status === ScanStatus.DONE ||
@@ -119,8 +99,7 @@ export class BasePolling implements Polling {
   }
 
   private delay(): Promise<void> {
-    const interval =
-      this.toMilliseconds(this.options.interval) ?? this.defaultInterval;
+    const interval = this.options.interval ?? this.defaultInterval;
 
     return new Promise<void>((resolve) => setTimeout(resolve, interval));
   }

src/Scan/PollingFactory.ts

@@ -2,7 +2,7 @@ import { Polling } from './Polling';
 import { BreakpointType } from './BreakpointType';
 
 export interface PollingConfig {
-  timeout?: number | string;
+  timeout?: number;
   interval?: number;
   breakpoint: BreakpointType;
   scanId: string;

src/Utils/Helpers.spec.ts

@@ -258,6 +258,7 @@ describe('Helpers', () => {
       expect(actual).toEqual([TestEnum.TEST, TestEnum.PROD]);
     });
   });
+
   describe('parseHeaders', () => {
     it('should return empty object', () => {
       // arrange