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
Add initial classes structure for the OCPP 2.0 stack
[e-mobility-charging-stations-simulator.git]
/
src
/
utils
/
Utils.ts
diff --git
a/src/utils/Utils.ts
b/src/utils/Utils.ts
index 006e9ddd40278c8f3e84d75f4e4306267c3fcfed..94fa3d186e432712238ceee87e7f3491244cb5b7 100644
(file)
--- a/
src/utils/Utils.ts
+++ b/
src/utils/Utils.ts
@@
-1,5
+1,7
@@
import crypto from 'crypto';
import crypto from 'crypto';
+import clone from 'just-clone';
+
import { WebSocketCloseEventStatusString } from '../types/WebSocket';
export default class Utils {
import { WebSocketCloseEventStatusString } from '../types/WebSocket';
export default class Utils {
@@
-50,7
+52,9
@@
export default class Utils {
return Utils.formatDurationMilliSeconds(duration * 1000);
}
return Utils.formatDurationMilliSeconds(duration * 1000);
}
- public static convertToDate(value: unknown): Date | null | undefined {
+ public static convertToDate(
+ value: Date | string | number | null | undefined
+ ): Date | null | undefined {
if (Utils.isNullOrUndefined(value)) {
return value as null | undefined;
}
if (Utils.isNullOrUndefined(value)) {
return value as null | undefined;
}
@@
-58,36
+62,42
@@
export default class Utils {
return value;
}
if (Utils.isString(value) || typeof value === 'number') {
return value;
}
if (Utils.isString(value) || typeof value === 'number') {
- return new Date(value
as string | number
);
+ return new Date(value);
}
return null;
}
public static convertToInt(value: unknown): number {
}
return null;
}
public static convertToInt(value: unknown): number {
- let changedValue: number = value as number;
if (!value) {
return 0;
}
if (!value) {
return 0;
}
+ let changedValue: number = value as number;
if (Number.isSafeInteger(value)) {
return value as number;
}
if (typeof value === 'number') {
if (Number.isSafeInteger(value)) {
return value as number;
}
if (typeof value === 'number') {
-
changedValue =
Math.trunc(value);
+
return
Math.trunc(value);
}
if (Utils.isString(value)) {
changedValue = parseInt(value as string);
}
}
if (Utils.isString(value)) {
changedValue = parseInt(value as string);
}
+ if (isNaN(changedValue)) {
+ throw new Error(`Cannot convert to integer: ${value.toString()}`);
+ }
return changedValue;
}
public static convertToFloat(value: unknown): number {
return changedValue;
}
public static convertToFloat(value: unknown): number {
- let changedValue: number = value as number;
if (!value) {
return 0;
}
if (!value) {
return 0;
}
+ let changedValue: number = value as number;
if (Utils.isString(value)) {
changedValue = parseFloat(value as string);
}
if (Utils.isString(value)) {
changedValue = parseFloat(value as string);
}
+ if (isNaN(changedValue)) {
+ throw new Error(`Cannot convert to float: ${value.toString()}`);
+ }
return changedValue;
}
return changedValue;
}
@@
-96,7
+106,7
@@
export default class Utils {
if (value) {
// Check the type
if (typeof value === 'boolean') {
if (value) {
// Check the type
if (typeof value === 'boolean') {
- re
sult =
value;
+ re
turn
value;
} else if (
Utils.isString(value) &&
((value as string).toLowerCase() === 'true' || value === '1')
} else if (
Utils.isString(value) &&
((value as string).toLowerCase() === 'true' || value === '1')
@@
-163,8
+173,12
@@
export default class Utils {
);
}
);
}
- public static cloneObject<T>(object: T): T {
- return JSON.parse(JSON.stringify(object)) as T;
+ public static isObject(item: unknown): boolean {
+ return item && typeof item === 'object' && Array.isArray(item) === false;
+ }
+
+ public static cloneObject<T extends object>(object: T): T {
+ return clone<T>(object);
}
public static isIterable<T>(obj: T): boolean {
}
public static isIterable<T>(obj: T): boolean {
@@
-214,7
+228,7
@@
export default class Utils {
`${str.slice(0, pos)}${subStr}${str.slice(pos)}`;
/**
`${str.slice(0, pos)}${subStr}${str.slice(pos)}`;
/**
- * @param
[retryNumber=0]
+ * @param
retryNumber - the number of retries that have already been attempted
* @returns delay in milliseconds
*/
public static exponentialDelay(retryNumber = 0): number {
* @returns delay in milliseconds
*/
public static exponentialDelay(retryNumber = 0): number {
@@
-253,7
+267,7
@@
export default class Utils {
}
public static JSONStringifyWithMapSupport(
}
public static JSONStringifyWithMapSupport(
- obj: Record<string, unknown> | Record<string, unknown>[],
+ obj: Record<string, unknown> | Record<string, unknown>[]
| Map<string, unknown>
,
space?: number
): string {
return JSON.stringify(
space?: number
): string {
return JSON.stringify(
@@
-274,7
+288,7
@@
export default class Utils {
/**
* Convert websocket error code to human readable string message
*
/**
* Convert websocket error code to human readable string message
*
- * @param code websocket error code
+ * @param code
-
websocket error code
* @returns human readable string message
*/
public static getWebSocketCloseEventStatusString(code: number): string {
* @returns human readable string message
*/
public static getWebSocketCloseEventStatusString(code: number): string {