X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=ui%2Fweb%2Fsrc%2Fcomposables%2FUIClient.ts;h=ccd16c215565855d99ec0fa400bb7da0f8dd89bc;hb=f568f36861d62d759a95b17fbe10380eca88a71b;hp=7c0c06c121be0da21190687cc2ea752feb197fd3;hpb=12f26d4a81773cf8ede8bad4255e36aadf10bce0;p=e-mobility-charging-stations-simulator.git diff --git a/ui/web/src/composables/UIClient.ts b/ui/web/src/composables/UIClient.ts index 7c0c06c1..ccd16c21 100644 --- a/ui/web/src/composables/UIClient.ts +++ b/ui/web/src/composables/UIClient.ts @@ -1,21 +1,21 @@ -import Utils from './Utils'; +import { promiseWithTimeout } from './Utils'; import { ProcedureName, type ProtocolResponse, type RequestPayload, type ResponsePayload, ResponseStatus, -} from '@/types/UIProtocol'; +} from '@/types'; import config from '@/assets/config'; type ResponseHandler = { procedureName: ProcedureName; resolve: (value: ResponsePayload | PromiseLike) => void; - reject: (reason?: any) => void; + reject: (reason?: unknown) => void; }; export default class UIClient { - private static _instance: UIClient | null = null; + private static instance: UIClient | null = null; private ws!: WebSocket; private responseHandlers: Map; @@ -26,10 +26,10 @@ export default class UIClient { } public static getInstance() { - if (UIClient._instance === null) { - UIClient._instance = new UIClient(); + if (UIClient.instance === null) { + UIClient.instance = new UIClient(); } - return UIClient._instance; + return UIClient.instance; } public registerWSonOpenListener(listener: (event: Event) => void) { @@ -128,7 +128,7 @@ export default class UIClient { id: string, procedureName: ProcedureName, resolve: (value: ResponsePayload | PromiseLike) => void, - reject: (reason?: any) => void + reject: (reason?: unknown) => void ): void { this.responseHandlers.set(id, { procedureName, resolve, reject }); } @@ -146,7 +146,7 @@ export default class UIClient { data: RequestPayload ): Promise { let uuid: string; - return Utils.promiseWithTimeout( + return promiseWithTimeout( new Promise((resolve, reject) => { uuid = crypto.randomUUID(); const msg = JSON.stringify([uuid, command, data]);