-import { promiseWithTimeout } from './Utils';
import {
ProcedureName,
type ProtocolResponse,
data: RequestPayload,
): Promise<ResponsePayload> {
let uuid: string;
- return promiseWithTimeout(
- new Promise<ResponsePayload>((resolve, reject) => {
- uuid = crypto.randomUUID();
- const msg = JSON.stringify([uuid, command, data]);
+ return await new Promise<ResponsePayload>((resolve, reject) => {
+ uuid = crypto.randomUUID();
+ const msg = JSON.stringify([uuid, command, data]);
- if (this.ws.readyState !== WebSocket.OPEN) {
- this.openWS();
- }
- if (this.ws.readyState === WebSocket.OPEN) {
+ 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);
- } 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 [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 {