repositories
/
e-mobility-charging-stations-simulator.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Switch log messages to string literal
[e-mobility-charging-stations-simulator.git]
/
src
/
utils
/
Utils.ts
diff --git
a/src/utils/Utils.ts
b/src/utils/Utils.ts
index 0da6289c242ea69e3b3b72aa32657a190a631b6f..89119bc2df77181529b4de1371fbcc908c58e251 100644
(file)
--- a/
src/utils/Utils.ts
+++ b/
src/utils/Utils.ts
@@
-1,7
+1,9
@@
-import crypto from 'crypto';
+import crypto from 'node:crypto';
+import util from 'node:util';
import clone from 'just-clone';
import clone from 'just-clone';
+import Constants from './Constants';
import { WebSocketCloseEventStatusString } from '../types/WebSocket';
export default class Utils {
import { WebSocketCloseEventStatusString } from '../types/WebSocket';
export default class Utils {
@@
-37,15
+39,15
@@
export default class Utils {
let secondsStr = seconds.toString();
if (hours < 10) {
let secondsStr = seconds.toString();
if (hours < 10) {
- hoursStr =
'0' + hours.toString()
;
+ hoursStr =
`0${hours.toString()}`
;
}
if (minutes < 10) {
}
if (minutes < 10) {
- minutesStr =
'0' + minutes.toString()
;
+ minutesStr =
`0${minutes.toString()}`
;
}
if (seconds < 10) {
}
if (seconds < 10) {
- secondsStr =
'0' + seconds.toString()
;
+ secondsStr =
`0${seconds.toString()}`
;
}
}
- return
hoursStr + ':' + minutesStr + ':' + secondsStr.substring(0, 6)
;
+ return
`${hoursStr}:${minutesStr}:${secondsStr.substring(0, 6)}`
;
}
public static formatDurationSeconds(duration: number): string {
}
public static formatDurationSeconds(duration: number): string {
@@
-128,16
+130,13
@@
export default class Utils {
return sign * (randomPositiveFloat * (max - min) + min);
}
return sign * (randomPositiveFloat * (max - min) + min);
}
- public static getRandomInteger(max = Number.MAX_SAFE_INTEGER, min = 0): number {
- if (max < min || max < 0 || min < 0) {
- throw new RangeError('Invalid interval');
- }
+ public static getRandomInteger(max = Constants.MAX_RANDOM_INTEGER, min = 0): number {
max = Math.floor(max);
if (!Utils.isNullOrUndefined(min) && min !== 0) {
min = Math.ceil(min);
max = Math.floor(max);
if (!Utils.isNullOrUndefined(min) && min !== 0) {
min = Math.ceil(min);
- return Math.floor(
Utils.secureRandom() * (max - min + 1)) + min
;
+ return Math.floor(
crypto.randomInt(min, max + 1))
;
}
}
- return Math.floor(
Utils.secureRandom() *
(max + 1));
+ return Math.floor(
crypto.randomInt
(max + 1));
}
public static roundTo(numberValue: number, scale: number): number {
}
public static roundTo(numberValue: number, scale: number): number {
@@
-174,7
+173,11
@@
export default class Utils {
}
public static isObject(item: unknown): boolean {
}
public static isObject(item: unknown): boolean {
- return item && typeof item === 'object' && Array.isArray(item) === false;
+ return (
+ Utils.isNullOrUndefined(item) === false &&
+ typeof item === 'object' &&
+ Array.isArray(item) === false
+ );
}
public static cloneObject<T extends object>(object: T): T {
}
public static cloneObject<T extends object>(object: T): T {
@@
-237,6
+240,10
@@
export default class Utils {
return delay + randomSum;
}
return delay + randomSum;
}
+ public static isPromisePending(promise: Promise<unknown>): boolean {
+ return util.inspect(promise).includes('pending');
+ }
+
public static async promiseWithTimeout<T>(
promise: Promise<T>,
timeoutMs: number,
public static async promiseWithTimeout<T>(
promise: Promise<T>,
timeoutMs: number,
@@
-248,7
+255,10
@@
export default class Utils {
// Create a timeout promise that rejects in timeout milliseconds
const timeoutPromise = new Promise<never>((_, reject) => {
setTimeout(() => {
// Create a timeout promise that rejects in timeout milliseconds
const timeoutPromise = new Promise<never>((_, reject) => {
setTimeout(() => {
- timeoutCallback();
+ if (Utils.isPromisePending(promise)) {
+ timeoutCallback();
+ // FIXME: The original promise shall be canceled
+ }
reject(timeoutError);
}, timeoutMs);
});
reject(timeoutError);
}, timeoutMs);
});