X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Futils%2FUtils.ts;h=4306d8872e0114928481769feb6bb6daf5ff603e;hb=039211f91daa930e261a976c0c5ffbf729fbe922;hp=bffa0a17982fb7b9364cee51ad6cadeb84f096da;hpb=dada83ec9f4fb9426070147b43615d494ae86fcc;p=e-mobility-charging-stations-simulator.git

diff --git a/src/utils/Utils.ts b/src/utils/Utils.ts
index bffa0a17..4306d887 100644
--- a/src/utils/Utils.ts
+++ b/src/utils/Utils.ts
@@ -3,7 +3,8 @@ import util from 'node:util';
 
 import clone from 'just-clone';
 
-import { Constants } from './internal';
+// import { Constants } from './internal';
+import { Constants } from './Constants';
 import { WebSocketCloseEventStatusString } from '../types';
 
 export class Utils {
@@ -185,14 +186,12 @@ export class Utils {
     return clone<T>(object);
   }
 
-  public static objectHasOwnProperty(object: object, property: string): boolean {
-    return (
-      Utils.isObject(object) && (Object.prototype.hasOwnProperty.call(object, property) as boolean)
-    );
+  public static hasOwnProp(object: unknown, property: PropertyKey): boolean {
+    return Utils.isObject(object) && Object.hasOwn(object as object, property);
   }
 
   public static isCFEnvironment(): boolean {
-    return process.env.VCAP_APPLICATION !== undefined;
+    return !Utils.isNullOrUndefined(process.env.VCAP_APPLICATION);
   }
 
   public static isIterable<T>(obj: T): boolean {
@@ -224,17 +223,11 @@ export class Utils {
   }
 
   public static isEmptyArray(object: unknown | unknown[]): boolean {
-    if (Array.isArray(object) && object.length === 0) {
-      return true;
-    }
-    return false;
+    return Array.isArray(object) && object.length === 0;
   }
 
   public static isNotEmptyArray(object: unknown | unknown[]): boolean {
-    if (Array.isArray(object) && object.length > 0) {
-      return true;
-    }
-    return false;
+    return Array.isArray(object) && object.length > 0;
   }
 
   public static isEmptyObject(obj: object): boolean {
@@ -256,9 +249,9 @@ export class Utils {
    * @param retryNumber - the number of retries that have already been attempted
    * @returns delay in milliseconds
    */
-  public static exponentialDelay(retryNumber = 0): number {
+  public static exponentialDelay(retryNumber = 0, maxDelayRatio = 0.2): number {
     const delay = Math.pow(2, retryNumber) * 100;
-    const randomSum = delay * 0.2 * Utils.secureRandom(); // 0-20% of the delay
+    const randomSum = delay * maxDelayRatio * Utils.secureRandom(); // 0-20% of the delay
     return delay + randomSum;
   }