command: ProcedureName,
data: RequestPayload,
): Promise<ResponsePayload> {
- let uuid: string;
- return await new Promise<ResponsePayload>((resolve, reject) => {
- uuid = crypto.randomUUID();
- const msg = JSON.stringify([uuid, command, data]);
-
+ return new Promise<ResponsePayload>((resolve, reject) => {
if (this.ws.readyState !== WebSocket.OPEN) {
this.openWS();
}
if (this.ws.readyState === WebSocket.OPEN) {
- setTimeout(() => {
+ const uuid = crypto.randomUUID();
+ const msg = JSON.stringify([uuid, command, data]);
+ const sendTimeout = setTimeout(() => {
this.deleteResponseHandler(uuid);
return reject(new Error(`Send request '${command}' message timeout`));
}, 60 * 1000);
- this.ws.send(msg);
+ try {
+ this.ws.send(msg);
+ this.setResponseHandler(uuid, command, resolve, reject);
+ } catch (error) {
+ this.deleteResponseHandler(uuid);
+ reject(error);
+ } finally {
+ clearTimeout(sendTimeout);
+ }
} else {
throw new Error(`Send request '${command}' message: connection not opened`);
}
-
- this.setResponseHandler(uuid, command, resolve, reject);
});
}
const [uuid, responsePayload] = response;
if (this.responseHandlers.has(uuid) === true) {
+ const { procedureName, resolve, reject } = this.getResponseHandler(uuid)!;
switch (responsePayload.status) {
case ResponseStatus.SUCCESS:
- this.getResponseHandler(uuid)?.resolve(responsePayload);
+ resolve(responsePayload);
break;
case ResponseStatus.FAILURE:
- this.getResponseHandler(uuid)?.reject(responsePayload);
+ reject(responsePayload);
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 {