camstreamerlib 3.3.2 → 3.4.0

package/CamOverlayDrawingAPI.d.ts

@@ -20,6 +20,10 @@ export type TUploadImageResponse = {
     height: number;
     call_id: number;
 };
+export type TErrorResponse = {
+    error: string;
+    call_id?: number;
+};
 export type TService = {
     id: number;
     enabled: number;
@@ -55,6 +59,7 @@ export declare class CamOverlayDrawingAPI extends EventEmitter {
     private zIndex;
     private callId;
     private sendMessages;
+    private timeoutCheckTimer;
     private wsConnected;
     private ws;
     constructor(options?: CamOverlayDrawingOptions);
@@ -69,8 +74,12 @@ export declare class CamOverlayDrawingAPI extends EventEmitter {
     showCairoImageAbsolute(cairoImage: string, posX: number, posY: number, width: number, height: number): Promise<TCairoResponse>;
     removeImage(): Promise<TCairoResponse>;
     private createWsClient;
+    private incomingWsMessageHandler;
     private sendMessage;
     private sendBinaryMessage;
+    private startMsgsTimeoutCheck;
+    private stopMsgsTimeoutCheck;
+    private reconnectWithError;
     private reportMessage;
     private reportError;
     private reportClose;

package/CamOverlayDrawingAPI.js

@@ -29,9 +29,11 @@ class CamOverlayDrawingAPI extends EventEmitter {
     }
     connect() {
         this.ws.open();
+        this.startMsgsTimeoutCheck();
     }
     disconnect() {
         this.ws.close();
+        this.stopMsgsTimeoutCheck();
     }
     isConnected() {
         return this.wsConnected;
@@ -88,73 +90,119 @@ class CamOverlayDrawingAPI extends EventEmitter {
         };
         this.ws = new WsClient_1.WsClient(options);
         this.ws.on('open', () => {
+            console.log('CamOverlay connection opened');
             this.wsConnected = true;
             this.emit('open');
         });
-        this.ws.on('message', (data) => {
-            const dataJSON = JSON.parse(data.toString());
-            if (Object.hasOwn(dataJSON, 'call_id') && dataJSON['call_id'] in this.sendMessages) {
-                if (Object.hasOwn(dataJSON, 'error')) {
-                    this.sendMessages[dataJSON.call_id].reject(new Error(dataJSON.error));
-                }
-                else {
-                    this.sendMessages[dataJSON.call_id].resolve(dataJSON);
-                }
-                delete this.sendMessages[dataJSON['call_id']];
-            }
-            if (Object.hasOwn(dataJSON, 'error')) {
-                this.reportError(new Error(dataJSON.error));
-            }
-            else {
-                this.reportMessage(data.toString());
-            }
-        });
+        this.ws.on('message', (msgData) => this.incomingWsMessageHandler(msgData));
         this.ws.on('error', (error) => {
             this.reportError(error);
         });
         this.ws.on('close', () => {
+            console.log('CamOverlay connection closed');
             this.wsConnected = false;
             this.reportClose();
         });
     }
+    incomingWsMessageHandler(msgData) {
+        const dataJSON = JSON.parse(msgData.toString());
+        let errorResponse;
+        if ('error' in dataJSON) {
+            errorResponse = dataJSON;
+        }
+        if (dataJSON.call_id !== undefined && this.sendMessages[dataJSON.call_id] !== undefined) {
+            if (errorResponse !== undefined) {
+                this.sendMessages[dataJSON.call_id].reject(new Error(errorResponse.error));
+            }
+            else {
+                this.sendMessages[dataJSON.call_id].resolve(dataJSON);
+            }
+            delete this.sendMessages[dataJSON.call_id];
+        }
+        if (errorResponse !== undefined) {
+            this.reconnectWithError(new Error(errorResponse.error));
+        }
+        else {
+            this.reportMessage(msgData.toString());
+        }
+    }
     sendMessage(msgJson) {
         return new Promise((resolve, reject) => {
             try {
-                this.sendMessages[this.callId] = { resolve, reject };
-                msgJson['call_id'] = this.callId++;
                 if (!this.wsConnected) {
                     throw new Error('No CamOverlay connection');
                 }
+                msgJson.call_id = ++this.callId;
                 this.ws.send(JSON.stringify(msgJson));
+                this.sendMessages[this.callId] = { resolve, reject, sentTimestamp: Date.now() };
             }
             catch (err) {
-                const errorMessage = err instanceof Error ? err.message : err;
-                this.reportError(new Error(`Send message error: ${errorMessage}`));
+                const errorMessage = err instanceof Error ? err.message : 'Unknown error';
+                const error = new Error(`Send message error: ${errorMessage}`);
+                reject(error);
+                if (!this.wsConnected) {
+                    this.reportError(error);
+                }
+                else {
+                    this.reconnectWithError(error);
+                }
             }
         });
     }
     sendBinaryMessage(msgJson, data) {
         return new Promise((resolve, reject) => {
             try {
-                this.sendMessages[this.callId] = { resolve, reject };
-                msgJson['call_id'] = this.callId++;
+                if (!this.wsConnected) {
+                    throw new Error('No CamOverlay connection');
+                }
+                msgJson.call_id = ++this.callId;
                 const jsonBuffer = Buffer.from(JSON.stringify(msgJson));
                 const header = new ArrayBuffer(5);
                 const headerView = new DataView(header);
                 headerView.setInt8(0, 1);
                 headerView.setInt32(1, jsonBuffer.byteLength);
                 const msgBuffer = Buffer.concat([Buffer.from(header), jsonBuffer, data]);
-                if (!this.wsConnected) {
-                    throw new Error('No CamOverlay connection');
-                }
                 this.ws.send(msgBuffer);
+                this.sendMessages[this.callId] = { resolve, reject, sentTimestamp: Date.now() };
             }
             catch (err) {
-                const errorMessage = err instanceof Error ? err.message : err;
-                this.reportError(new Error(`Send binary message error: ${errorMessage}`));
+                const errorMessage = err instanceof Error ? err.message : 'Unknown error';
+                const error = new Error(`Send binary message error: ${errorMessage}`);
+                reject(error);
+                if (!this.wsConnected) {
+                    this.reportError(error);
+                }
+                else {
+                    this.reconnectWithError(error);
+                }
             }
         });
     }
+    startMsgsTimeoutCheck() {
+        clearInterval(this.timeoutCheckTimer);
+        this.timeoutCheckTimer = setInterval(() => {
+            let reconnect = false;
+            const now = Date.now();
+            for (const callId in this.sendMessages) {
+                const msg = this.sendMessages[callId];
+                if (now - msg.sentTimestamp > 10000) {
+                    reconnect = true;
+                    msg.reject(new Error('Message timeout'));
+                    delete this.sendMessages[callId];
+                }
+            }
+            if (reconnect) {
+                this.reconnectWithError(new Error('Message timeout'));
+            }
+        }, 5000);
+    }
+    stopMsgsTimeoutCheck() {
+        clearInterval(this.timeoutCheckTimer);
+    }
+    reconnectWithError(err) {
+        this.reportError(err);
+        this.ws.reconnect();
+    }
     reportMessage(msg) {
         this.emit('message', msg);
     }

package/CamOverlayPainter/Frame.d.ts

@@ -30,7 +30,11 @@ export type TFrameInfo = {
 };
 export type TDrawingCallback = (cod: CamOverlayDrawingAPI, cairo: string, info: TFrameInfo) => Promise<void>;
 export interface Frame {
+    on(event: 'open', listener: () => void): this;
+    on(event: 'close', listener: () => void): this;
     on(event: 'layoutChanged', listener: () => void): this;
+    emit(event: 'open'): boolean;
+    emit(event: 'close'): boolean;
     emit(event: 'layoutChanged'): boolean;
 }
 export declare class Frame extends EventEmitter {
@@ -41,10 +45,12 @@ export declare class Frame extends EventEmitter {
     protected height: number;
     private text;
     private fontColor;
+    private fontName?;
     private font?;
     private align;
     private textType;
     private bgColor?;
+    private bgImageName?;
     private bgImage?;
     private bgType?;
     private borderRadius;

package/CamOverlayPainter/Frame.js

@@ -26,9 +26,9 @@ class Frame extends events_1.EventEmitter {
         this.height = opt.height;
         this.setText((_b = opt.text) !== null && _b !== void 0 ? _b : '', 'A_LEFT');
         this.fontColor = (_c = opt.fontColor) !== null && _c !== void 0 ? _c : [1.0, 1.0, 1.0];
-        this.font = opt.font;
+        this.fontName = opt.font;
         this.bgColor = opt.bgColor;
-        this.bgImage = opt.bgImage;
+        this.bgImageName = opt.bgImage;
         this.bgType = opt.bgType;
         this.borderRadius = (_d = opt.borderRadius) !== null && _d !== void 0 ? _d : 0;
         this.borderWidth = (_e = opt.borderWidth) !== null && _e !== void 0 ? _e : 0;
@@ -62,19 +62,23 @@ class Frame extends events_1.EventEmitter {
         this.fontColor = fontColor;
     }
     setFont(fontName) {
-        this.font = fontName;
+        this.fontName = fontName;
+        this.font = undefined;
     }
     setFontData(fontData) {
+        this.fontName = undefined;
         this.font = fontData;
     }
     setBgColor(color) {
         this.bgColor = color;
     }
     setBgImage(imageName, type = 'fit') {
-        this.bgImage = imageName;
+        this.bgImageName = imageName;
+        this.bgImage = undefined;
         this.bgType = type;
     }
     setBgImageData(imageData, type = 'fit') {
+        this.bgImageName = undefined;
         this.bgImage = imageData;
         this.bgType = type;
     }
@@ -157,11 +161,11 @@ class Frame extends events_1.EventEmitter {
     }
     prepareResources(resourceManager) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (typeof this.bgImage === 'string') {
-                this.bgImage = yield resourceManager.image(this.bgImage);
+            if (this.bgImageName !== undefined) {
+                this.bgImage = yield resourceManager.image(this.bgImageName);
             }
-            if (typeof this.font === 'string') {
-                this.font = yield resourceManager.font(this.font);
+            if (this.fontName !== undefined) {
+                this.font = yield resourceManager.font(this.fontName);
             }
         });
     }
@@ -171,7 +175,7 @@ class Frame extends events_1.EventEmitter {
                 return;
             }
             const promises = new Array();
-            if (this.font !== undefined && typeof this.font !== 'string') {
+            if (this.font !== undefined) {
                 promises.push(cod.cairo('cairo_set_font_face', cairo, this.font.var));
             }
             else {
@@ -230,7 +234,7 @@ class Frame extends events_1.EventEmitter {
     }
     drawImage(cod, cairo, scale, ppX, ppY) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.bgImage === undefined || typeof this.bgImage === 'string') {
+            if (this.bgImage === undefined) {
                 return;
             }
             const bgImage = this.bgImage.var;

package/CamOverlayPainter/Painter.js

@@ -46,6 +46,12 @@ class Painter extends Frame_1.Frame {
     connect() {
         this.cod.on('open', () => {
             this.rm.clear();
+            this.layers = [];
+            this.refreshLayers = true;
+            this.emit('open');
+        });
+        this.cod.on('close', () => {
+            this.emit('close');
         });
         this.cod.on('error', (err) => {
             console.error('Painter:', err);

package/CamOverlayPainter/ResourceManager.d.ts

@@ -1,14 +1,14 @@
 import { CamOverlayDrawingAPI, TUploadImageResponse, TCairoCreateResponse } from '../CamOverlayDrawingAPI';
 export default class ResourceManager {
     private co;
-    private imgFiles;
-    private fontFiles;
+    private imgFileNames;
+    private fontFileNames;
     private images;
     private fonts;
     constructor(co: CamOverlayDrawingAPI);
-    image(moniker: string): Promise<TUploadImageResponse>;
-    font(moniker: string): Promise<TCairoCreateResponse>;
     registerImage(moniker: string, fileName: string): void;
     registerFont(moniker: string, fileName: string): void;
+    image(moniker: string): Promise<TUploadImageResponse>;
+    font(moniker: string): Promise<TCairoCreateResponse>;
     clear(): void;
 }

package/CamOverlayPainter/ResourceManager.js

@@ -13,18 +13,24 @@ const fs = require("fs/promises");
 class ResourceManager {
     constructor(co) {
         this.co = co;
-        this.imgFiles = {};
-        this.fontFiles = {};
+        this.imgFileNames = {};
+        this.fontFileNames = {};
         this.images = {};
         this.fonts = {};
     }
+    registerImage(moniker, fileName) {
+        this.imgFileNames[moniker] = process.env.INSTALL_PATH + '/images/' + fileName;
+    }
+    registerFont(moniker, fileName) {
+        this.fontFileNames[moniker] = process.env.INSTALL_PATH + '/fonts/' + fileName;
+    }
     image(moniker) {
         return __awaiter(this, void 0, void 0, function* () {
             if (moniker in this.images) {
                 return this.images[moniker];
             }
-            else if (moniker in this.imgFiles) {
-                const imgData = yield fs.readFile(this.imgFiles[moniker]);
+            else if (moniker in this.imgFileNames) {
+                const imgData = yield fs.readFile(this.imgFileNames[moniker]);
                 this.images[moniker] = yield this.co.uploadImageData(imgData);
                 return this.images[moniker];
             }
@@ -38,8 +44,8 @@ class ResourceManager {
             if (moniker in this.fonts) {
                 return this.fonts[moniker];
             }
-            else if (moniker in this.fontFiles) {
-                const fontData = yield fs.readFile(this.fontFiles[moniker]);
+            else if (moniker in this.fontFileNames) {
+                const fontData = yield fs.readFile(this.fontFileNames[moniker]);
                 this.fonts[moniker] = yield this.co.uploadFontData(fontData);
                 return this.fonts[moniker];
             }
@@ -48,12 +54,6 @@ class ResourceManager {
             }
         });
     }
-    registerImage(moniker, fileName) {
-        this.imgFiles[moniker] = process.env.INSTALL_PATH + '/images/' + fileName;
-    }
-    registerFont(moniker, fileName) {
-        this.fontFiles[moniker] = process.env.INSTALL_PATH + '/fonts/' + fileName;
-    }
     clear() {
         this.images = {};
         this.fonts = {};

package/CamScripterAPICameraEventsGenerator.d.ts

@@ -35,6 +35,10 @@ export type TResponse = {
     call_id: number;
     message: string;
 };
+export type TErrorResponse = {
+    error: string;
+    call_id?: number;
+};
 export interface CamScripterAPICameraEventsGenerator {
     on(event: 'open', listener: () => void): this;
     on(event: 'close', listener: () => void): this;
@@ -53,6 +57,7 @@ export declare class CamScripterAPICameraEventsGenerator extends EventEmitter {
     private camScripterAcapName;
     private callId;
     private sendMessages;
+    private timeoutCheckTimer;
     private wsConnected;
     private ws;
     constructor(options?: CamScripterOptions);
@@ -62,7 +67,11 @@ export declare class CamScripterAPICameraEventsGenerator extends EventEmitter {
     undeclareEvent(eventUndeclaration: TEventUndeclaration): Promise<TResponse>;
     sendEvent(event: TEvent): Promise<TResponse>;
     private createWsClient;
+    private incomingWsMessageHandler;
     private sendMessage;
+    private startMsgsTimeoutCheck;
+    private stopMsgsTimeoutCheck;
+    private reconnectWithError;
     private reportErr;
     private reportClose;
 }

package/CamScripterAPICameraEventsGenerator.js

@@ -22,9 +22,11 @@ class CamScripterAPICameraEventsGenerator extends EventEmitter {
     }
     connect() {
         this.ws.open();
+        this.startMsgsTimeoutCheck();
     }
     disconnect() {
         this.ws.close();
+        this.stopMsgsTimeoutCheck();
     }
     declareEvent(eventDeclaration) {
         return this.sendMessage({
@@ -63,21 +65,7 @@ class CamScripterAPICameraEventsGenerator extends EventEmitter {
             this.wsConnected = true;
             this.emit('open');
         });
-        this.ws.on('message', (data) => {
-            const dataJSON = JSON.parse(data.toString());
-            if (Object.hasOwn(dataJSON, 'call_id') && dataJSON['call_id'] in this.sendMessages) {
-                if (Object.hasOwn(dataJSON, 'error')) {
-                    this.sendMessages[dataJSON['call_id']].reject(new Error(dataJSON.error));
-                }
-                else {
-                    this.sendMessages[dataJSON['call_id']].resolve(dataJSON);
-                }
-                delete this.sendMessages[dataJSON['call_id']];
-            }
-            if (Object.hasOwn(dataJSON, 'error')) {
-                this.reportErr(new Error(dataJSON.error));
-            }
-        });
+        this.ws.on('message', (msgData) => this.incomingWsMessageHandler(msgData));
         this.ws.on('error', (error) => {
             this.reportErr(error);
         });
@@ -86,21 +74,68 @@ class CamScripterAPICameraEventsGenerator extends EventEmitter {
             this.reportClose();
         });
     }
+    incomingWsMessageHandler(msgData) {
+        const dataJSON = JSON.parse(msgData.toString());
+        let errorResponse;
+        if ('error' in dataJSON) {
+            errorResponse = dataJSON;
+        }
+        if (dataJSON.call_id !== undefined && this.sendMessages[dataJSON.call_id] !== undefined) {
+            if (errorResponse !== undefined) {
+                this.sendMessages[dataJSON.call_id].reject(new Error(errorResponse.error));
+            }
+            else {
+                this.sendMessages[dataJSON.call_id].resolve(dataJSON);
+            }
+            delete this.sendMessages[dataJSON.call_id];
+        }
+        if (errorResponse !== undefined) {
+            this.reconnectWithError(new Error(errorResponse.error));
+        }
+    }
     sendMessage(msgJson) {
         return new Promise((resolve, reject) => {
             if (!this.wsConnected) {
                 throw new Error("Websocket hasn't been opened yet.");
             }
             try {
-                this.sendMessages[this.callId] = { resolve, reject };
-                msgJson.call_id = this.callId++;
+                msgJson.call_id = ++this.callId;
                 this.ws.send(JSON.stringify(msgJson));
+                this.sendMessages[this.callId] = { resolve, reject, sentTimestamp: Date.now() };
             }
             catch (err) {
-                this.reportErr(new Error(`Send message error: ${err}`));
+                const errorMessage = err instanceof Error ? err.message : 'Unknown error';
+                const error = new Error(`Send message error: ${errorMessage}`);
+                reject(error);
+                this.reconnectWithError(error);
             }
         });
     }
+    startMsgsTimeoutCheck() {
+        clearInterval(this.timeoutCheckTimer);
+        this.timeoutCheckTimer = setInterval(() => {
+            let reconnect = false;
+            const now = Date.now();
+            for (const callId in this.sendMessages) {
+                const msg = this.sendMessages[callId];
+                if (now - msg.sentTimestamp > 10000) {
+                    reconnect = true;
+                    msg.reject(new Error('Message timeout'));
+                    delete this.sendMessages[callId];
+                }
+            }
+            if (reconnect) {
+                this.reconnectWithError(new Error('Message timeout'));
+            }
+        }, 5000);
+    }
+    stopMsgsTimeoutCheck() {
+        clearInterval(this.timeoutCheckTimer);
+    }
+    reconnectWithError(err) {
+        this.reportErr(err);
+        this.ws.reconnect();
+    }
     reportErr(err) {
         this.emit('error', err);
     }

package/internal/WsClient.d.ts

@@ -34,5 +34,6 @@ export declare class WsClient extends EventEmitter {
     open(wwwAuthenticateHeader?: string): void;
     send(data: Buffer | string): void;
     close(): void;
+    reconnect(): void;
     private closeWsConnection;
 }

package/internal/WsClient.js

@@ -12,7 +12,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.WsClient = void 0;
 const EventEmitter = require("events");
 const WebSocket = require("ws");
-const timersPromises = require("timers/promises");
 const Digest_1 = require("./Digest");
 class WsClient extends EventEmitter {
     constructor(options) {
@@ -38,54 +37,63 @@ class WsClient extends EventEmitter {
         };
     }
     open(wwwAuthenticateHeader) {
-        if (this.ws !== undefined) {
-            return;
-        }
-        this.isClosed = false;
-        if (this.protocol === undefined) {
-            this.ws = new WebSocket(this.address, this.wsOptions);
-        }
-        else {
-            this.ws = new WebSocket(this.address, this.protocol, this.wsOptions);
-        }
-        this.ws.binaryType = 'arraybuffer';
-        this.isAlive = true;
-        this.pingTimer = setInterval(() => __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            if ((this.ws && this.ws.readyState !== WebSocket.OPEN) || this.isAlive === false) {
-                this.emit('error', new Error('Connection timeout'));
-                yield this.closeWsConnection();
+        try {
+            if (this.ws !== undefined) {
+                return;
+            }
+            this.isClosed = false;
+            if (this.protocol === undefined) {
+                this.ws = new WebSocket(this.address, this.wsOptions);
             }
             else {
-                this.isAlive = false;
-                (_a = this.ws) === null || _a === void 0 ? void 0 : _a.ping();
+                this.ws = new WebSocket(this.address, this.protocol, this.wsOptions);
             }
-        }), this.pingInterval);
-        this.ws.on('pong', () => {
+            this.ws.binaryType = 'arraybuffer';
             this.isAlive = true;
-        });
-        if (wwwAuthenticateHeader !== undefined) {
-            this.wsOptions.headers['Authorization'] = new Digest_1.Digest().getAuthHeader(this.user, this.pass, 'GET', this.digestAddress, wwwAuthenticateHeader);
-        }
-        this.ws.on('unexpected-response', (req, res) => __awaiter(this, void 0, void 0, function* () {
-            var _b;
-            if (res.statusCode === 401 && res.headers['www-authenticate'] !== undefined) {
-                if (this.pingTimer) {
-                    clearInterval(this.pingTimer);
+            this.pingTimer = setInterval(() => __awaiter(this, void 0, void 0, function* () {
+                var _a;
+                if ((this.ws && this.ws.readyState !== WebSocket.OPEN) || this.isAlive === false) {
+                    this.emit('error', new Error('Connection timeout'));
+                    yield this.closeWsConnection();
                 }
-                (_b = this.ws) === null || _b === void 0 ? void 0 : _b.removeAllListeners();
-                this.ws = undefined;
-                this.open(res.headers['www-authenticate']);
-            }
-            else {
-                this.emit('error', new Error('Status code: ' + res.statusCode));
-                yield this.closeWsConnection();
+                else {
+                    this.isAlive = false;
+                    (_a = this.ws) === null || _a === void 0 ? void 0 : _a.ping();
+                }
+            }), this.pingInterval);
+            this.ws.on('pong', () => {
+                this.isAlive = true;
+            });
+            if (wwwAuthenticateHeader !== undefined) {
+                this.wsOptions.headers['Authorization'] = new Digest_1.Digest().getAuthHeader(this.user, this.pass, 'GET', this.digestAddress, wwwAuthenticateHeader);
             }
-        }));
-        this.ws.on('open', () => this.emit('open'));
-        this.ws.on('message', (data) => this.emit('message', data));
-        this.ws.on('error', (error) => this.emit('error', error));
-        this.ws.on('close', () => this.closeWsConnection());
+            this.ws.on('unexpected-response', (req, res) => __awaiter(this, void 0, void 0, function* () {
+                var _b;
+                if (res.statusCode === 401 && res.headers['www-authenticate'] !== undefined) {
+                    if (this.pingTimer) {
+                        clearInterval(this.pingTimer);
+                    }
+                    (_b = this.ws) === null || _b === void 0 ? void 0 : _b.removeAllListeners();
+                    this.ws = undefined;
+                    this.open(res.headers['www-authenticate']);
+                }
+                else {
+                    this.emit('error', new Error('Status code: ' + res.statusCode));
+                    yield this.closeWsConnection();
+                }
+            }));
+            this.ws.on('open', () => this.emit('open'));
+            this.ws.on('message', (data) => this.emit('message', data));
+            this.ws.on('error', (error) => {
+                this.emit('error', error);
+                this.closeWsConnection();
+            });
+            this.ws.on('close', () => this.closeWsConnection());
+        }
+        catch (error) {
+            this.emit('error', error instanceof Error ? error : new Error('Unknown error'));
+            this.closeWsConnection();
+        }
     }
     send(data) {
         if (this.ws === undefined) {
@@ -100,41 +108,45 @@ class WsClient extends EventEmitter {
             return;
         }
         this.isClosed = true;
-        const currentWs = this.ws;
-        this.closeWsConnection().catch((err) => {
-            console.error(err);
-        });
-        setTimeout(() => {
-            if (currentWs && currentWs.readyState !== WebSocket.CLOSED) {
-                currentWs.terminate();
-            }
-        }, 5000);
+        this.closeWsConnection();
+    }
+    reconnect() {
+        this.closeWsConnection();
     }
     closeWsConnection() {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                if (this.ws === undefined) {
-                    return;
-                }
-                this.ws.removeAllListeners();
-                if (this.pingTimer) {
-                    clearInterval(this.pingTimer);
-                }
-                if (this.ws.readyState !== WebSocket.CONNECTING &&
-                    this.ws.readyState !== WebSocket.CLOSING &&
-                    this.ws.readyState !== WebSocket.CLOSED) {
-                    this.ws.close();
-                }
-                this.ws = undefined;
-                this.emit('close');
-                if (!this.isClosed) {
-                    yield timersPromises.setTimeout(10000);
-                    yield this.open();
-                }
+        if (this.ws === undefined) {
+            return;
+        }
+        const wsCopy = this.ws;
+        this.ws = undefined;
+        try {
+            if (this.pingTimer) {
+                clearInterval(this.pingTimer);
             }
-            catch (err) {
+            wsCopy.removeAllListeners();
+            wsCopy.on('error', () => { });
+            if (wsCopy.readyState !== WebSocket.CLOSING && wsCopy.readyState !== WebSocket.CLOSED) {
+                wsCopy.close();
             }
-        });
+            setTimeout(() => {
+                if (wsCopy.readyState !== WebSocket.CLOSED) {
+                    wsCopy.terminate();
+                }
+            }, 5000);
+            this.emit('close');
+        }
+        catch (err) {
+            console.error(err);
+        }
+        finally {
+            const shouldRestart = !this.isClosed;
+            setTimeout(() => {
+                wsCopy.removeAllListeners();
+                if (shouldRestart && !this.isClosed) {
+                    this.open();
+                }
+            }, 10000);
+        }
     }
 }
 exports.WsClient = WsClient;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "camstreamerlib",
-  "version": "3.3.2",
+  "version": "3.4.0",
   "description": "Helper library for CamStreamer ACAP applications.",
   "prettier": "@camstreamer/prettier-config",
   "dependencies": {