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
build(deps-dev): apply updates
[e-mobility-charging-stations-simulator.git]
/
ui
/
web
/
src
/
composables
/
UIClient.ts
diff --git
a/ui/web/src/composables/UIClient.ts
b/ui/web/src/composables/UIClient.ts
index 006b60b537d9d975e080b44f88dc30538f299d5e..387d73d27529bfaf91e25f068bd9612ce53fb33c 100644
(file)
--- a/
ui/web/src/composables/UIClient.ts
+++ b/
ui/web/src/composables/UIClient.ts
@@
-1,4
+1,3
@@
-import { promiseWithTimeout } from './Utils';
import {
ProcedureName,
type ProtocolResponse,
import {
ProcedureName,
type ProtocolResponse,
@@
-71,7
+70,7
@@
export class UIClient {
public async startTransaction(
hashId: string,
connectorId: number,
public async startTransaction(
hashId: string,
connectorId: number,
- idTag: string | undefined
+ idTag: string | undefined
,
): Promise<ResponsePayload> {
return this.sendRequest(ProcedureName.START_TRANSACTION, {
hashIds: [hashId],
): Promise<ResponsePayload> {
return this.sendRequest(ProcedureName.START_TRANSACTION, {
hashIds: [hashId],
@@
-82,7
+81,7
@@
export class UIClient {
public async stopTransaction(
hashId: string,
public async stopTransaction(
hashId: string,
- transactionId: number | undefined
+ transactionId: number | undefined
,
): Promise<ResponsePayload> {
return this.sendRequest(ProcedureName.STOP_TRANSACTION, {
hashIds: [hashId],
): Promise<ResponsePayload> {
return this.sendRequest(ProcedureName.STOP_TRANSACTION, {
hashIds: [hashId],
@@
-92,7
+91,7
@@
export class UIClient {
public async startAutomaticTransactionGenerator(
hashId: string,
public async startAutomaticTransactionGenerator(
hashId: string,
- connectorId: number
+ connectorId: number
,
): Promise<ResponsePayload> {
return this.sendRequest(ProcedureName.START_AUTOMATIC_TRANSACTION_GENERATOR, {
hashIds: [hashId],
): Promise<ResponsePayload> {
return this.sendRequest(ProcedureName.START_AUTOMATIC_TRANSACTION_GENERATOR, {
hashIds: [hashId],
@@
-102,7
+101,7
@@
export class UIClient {
public async stopAutomaticTransactionGenerator(
hashId: string,
public async stopAutomaticTransactionGenerator(
hashId: string,
- connectorId: number
+ connectorId: number
,
): Promise<ResponsePayload> {
return this.sendRequest(ProcedureName.STOP_AUTOMATIC_TRANSACTION_GENERATOR, {
hashIds: [hashId],
): Promise<ResponsePayload> {
return this.sendRequest(ProcedureName.STOP_AUTOMATIC_TRANSACTION_GENERATOR, {
hashIds: [hashId],
@@
-113,7
+112,7
@@
export class UIClient {
private openWS(): void {
this.ws = new WebSocket(
`ws://${config.uiServer.host}:${config.uiServer.port}`,
private openWS(): void {
this.ws = new WebSocket(
`ws://${config.uiServer.host}:${config.uiServer.port}`,
- config.uiServer.protocol
+ config.uiServer.protocol
,
);
this.ws.onmessage = this.responseHandler.bind(this);
this.ws.onerror = (errorEvent) => {
);
this.ws.onmessage = this.responseHandler.bind(this);
this.ws.onerror = (errorEvent) => {
@@
-128,7
+127,7
@@
export class UIClient {
id: string,
procedureName: ProcedureName,
resolve: (value: ResponsePayload | PromiseLike<ResponsePayload>) => void,
id: string,
procedureName: ProcedureName,
resolve: (value: ResponsePayload | PromiseLike<ResponsePayload>) => void,
- reject: (reason?: unknown) => void
+ reject: (reason?: unknown) => void
,
): void {
this.responseHandlers.set(id, { procedureName, resolve, reject });
}
): void {
this.responseHandlers.set(id, { procedureName, resolve, reject });
}
@@
-143,56
+142,60
@@
export class UIClient {
private async sendRequest(
command: ProcedureName,
private async sendRequest(
command: ProcedureName,
- data: RequestPayload
+ data: RequestPayload
,
): Promise<ResponsePayload> {
): Promise<ResponsePayload> {
- let uuid: string;
- return promiseWithTimeout(
- new Promise((resolve, reject) => {
- uuid = crypto.randomUUID();
+ return new Promise<ResponsePayload>((resolve, reject) => {
+ if (this.ws.readyState !== WebSocket.OPEN) {
+ this.openWS();
+ }
+ if (this.ws.readyState === WebSocket.OPEN) {
+ const uuid = crypto.randomUUID();
const msg = JSON.stringify([uuid, command, data]);
const msg = JSON.stringify([uuid, command, data]);
-
- if (this.ws.readyState !== WebSocket.OPEN) {
-
this.openWS(
);
- }
-
if (this.ws.readyState === WebSocket.OPEN)
{
+ const sendTimeout = setTimeout(() => {
+ this.deleteResponseHandler(uuid);
+
return reject(new Error(`Send request '${command}' message timeout`)
);
+ }
, 60 * 1000);
+
try
{
this.ws.send(msg);
this.ws.send(msg);
- } else {
- throw new Error(`Send request '${command}' message: connection not opened`);
+ this.setResponseHandler(uuid, command, resolve, reject);
+ } catch (error) {
+ this.deleteResponseHandler(uuid);
+ reject(error);
+ } finally {
+ clearTimeout(sendTimeout);
}
}
-
- this.setResponseHandler(uuid, command, resolve, reject);
- }),
- 120 * 1000,
- Error(`Send request '${command}' message timeout`),
- () => {
- this.responseHandlers.delete(uuid);
+ } else {
+ throw new Error(`Send request '${command}' message: connection not opened`);
}
}
- );
+
}
);
}
private responseHandler(messageEvent: MessageEvent<string>): void {
const response = JSON.parse(messageEvent.data) as ProtocolResponse;
if (Array.isArray(response) === false) {
}
private responseHandler(messageEvent: MessageEvent<string>): void {
const response = JSON.parse(messageEvent.data) as ProtocolResponse;
if (Array.isArray(response) === false) {
- throw new Error(`Response not an array: ${JSON.stringify(response,
null
, 2)}`);
+ throw new Error(`Response not an array: ${JSON.stringify(response,
undefined
, 2)}`);
}
const [uuid, responsePayload] = response;
if (this.responseHandlers.has(uuid) === true) {
}
const [uuid, responsePayload] = response;
if (this.responseHandlers.has(uuid) === true) {
+ const { procedureName, resolve, reject } = this.getResponseHandler(uuid)!;
switch (responsePayload.status) {
case ResponseStatus.SUCCESS:
switch (responsePayload.status) {
case ResponseStatus.SUCCESS:
-
this.getResponseHandler(uuid)?.
resolve(responsePayload);
+ resolve(responsePayload);
break;
case ResponseStatus.FAILURE:
break;
case ResponseStatus.FAILURE:
-
this.getResponseHandler(uuid)?.
reject(responsePayload);
+ reject(responsePayload);
break;
default:
break;
default:
- console.error(`Response status not supported: ${responsePayload.status}`);
+ console.error(
+ `Response status for procedure '${procedureName}' not supported: '${responsePayload.status}'`,
+ );
}
this.deleteResponseHandler(uuid);
} else {
}
this.deleteResponseHandler(uuid);
} else {
- throw new Error(`Not a response to a request: ${JSON.stringify(response,
null
, 2)}`);
+ throw new Error(`Not a response to a request: ${JSON.stringify(response,
undefined
, 2)}`);
}
}
}
}
}
}