camstreamerlib 4.0.0-beta.47 → 4.0.0-beta.49

package/cjs/types/ws/CamStreamerEvents.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.csEventsSchema = void 0;
+const zod_1 = require("zod");
+const csEventsDataSchema = zod_1.z.discriminatedUnion('type', [
+    zod_1.z.object({ type: zod_1.z.literal('authorization'), state: zod_1.z.string() }),
+    zod_1.z.object({
+        type: zod_1.z.literal('StreamState'),
+        streamID: zod_1.z.number(),
+        enabled: zod_1.z.union([zod_1.z.literal(0), zod_1.z.literal(1)]),
+        active: zod_1.z.union([zod_1.z.literal(0), zod_1.z.literal(1)]),
+        automationState: zod_1.z.union([zod_1.z.literal(0), zod_1.z.literal(1)]),
+        isStreaming: zod_1.z.union([zod_1.z.literal(0), zod_1.z.literal(1)]),
+    }),
+    zod_1.z.object({
+        type: zod_1.z.literal('CS_API_SUCCESS'),
+        apiCall: zod_1.z.string(),
+        message: zod_1.z.string(),
+        streamID: zod_1.z.string(),
+    }),
+    zod_1.z.object({
+        type: zod_1.z.literal('CS_API_ERROR'),
+        apiCall: zod_1.z.string(),
+        message: zod_1.z.string(),
+        streamID: zod_1.z.string(),
+        code: zod_1.z.string(),
+    }),
+]);
+exports.csEventsSchema = zod_1.z.discriminatedUnion('type', [
+    zod_1.z.object({ type: zod_1.z.literal('init'), data: csEventsDataSchema }),
+    ...csEventsDataSchema.options,
+]);

package/cjs/types/ws/PlaneTrackerEvents.js

@@ -0,0 +1,103 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ptrEventsSchema = exports.EUserActions = void 0;
+const zod_1 = require("zod");
+const apiFlightDataSchema = zod_1.z.object({
+    icao: zod_1.z.string(),
+    lat: zod_1.z.number(),
+    lon: zod_1.z.number(),
+    heading: zod_1.z.number(),
+    groundSpeed: zod_1.z.number(),
+    altitudeAMSL: zod_1.z.number(),
+    cameraDistance: zod_1.z.number(),
+    autoTrackingOrder: zod_1.z.number(),
+    whiteListed: zod_1.z.boolean(),
+    blackListed: zod_1.z.boolean(),
+    priorityListed: zod_1.z.boolean(),
+    autoSelectionIgnored: zod_1.z.boolean(),
+    signalQuality: zod_1.z.number(),
+    emergencyState: zod_1.z.boolean(),
+    emergencyStatusMessage: zod_1.z.string(),
+});
+const apiUserSchema = zod_1.z.object({
+    userId: zod_1.z.string(),
+    userName: zod_1.z.string(),
+    userPriority: zod_1.z.string(),
+    ip: zod_1.z.string(),
+});
+var EUserActions;
+(function (EUserActions) {
+    EUserActions["TRACK_ICAO"] = "trackIcao.cgi";
+    EUserActions["RESET_ICAO"] = "resetIcao.cgi";
+    EUserActions["SET_PRIORITY_LIST"] = "setPriorityList.cgi";
+    EUserActions["SET_BLACK_LIST"] = "setBlackList.cgi";
+    EUserActions["SET_WHITE_LIST"] = "setWhiteList.cgi";
+    EUserActions["GO_TO_COORDINATES"] = "goToCoordinates.cgi";
+    EUserActions["SET_TRACKING_MODE"] = "setTrackingMode.cgi";
+    EUserActions["SET_ZONES"] = "setZones.cgi";
+    EUserActions["RESET_PTZ_CALIBRATION"] = "resetPtzCalibration.cgi";
+    EUserActions["LOCK_API"] = "lockApi.cgi";
+    EUserActions["UNLOCK_API"] = "unlockApi.cgi";
+})(EUserActions || (exports.EUserActions = EUserActions = {}));
+const ptrEventsDataSchema = zod_1.z.discriminatedUnion('type', [
+    zod_1.z.object({
+        type: zod_1.z.literal('CAMERA_POSITION'),
+        lat: zod_1.z.number(),
+        lon: zod_1.z.number(),
+        azimuth: zod_1.z.number().min(0).max(360),
+        elevation: zod_1.z.number().min(-90).max(90),
+        fov: zod_1.z.number(),
+    }),
+    zod_1.z.object({
+        type: zod_1.z.literal('TRACKING_START'),
+        icao: zod_1.z.string(),
+    }),
+    zod_1.z.object({
+        type: zod_1.z.literal('TRACKING_STOP'),
+    }),
+    zod_1.z.object({
+        type: zod_1.z.literal('FLIGHT_LIST'),
+        list: zod_1.z.array(apiFlightDataSchema),
+    }),
+    zod_1.z.object({
+        type: zod_1.z.literal('USER_ACTION'),
+        ip: zod_1.z.string(),
+        params: zod_1.z.object({
+            userId: zod_1.z.string(),
+            userName: zod_1.z.string(),
+            userPriority: zod_1.z.number(),
+        }),
+        cgi: zod_1.z.enum([
+            EUserActions.TRACK_ICAO,
+            EUserActions.RESET_ICAO,
+            EUserActions.SET_PRIORITY_LIST,
+            EUserActions.SET_BLACK_LIST,
+            EUserActions.SET_WHITE_LIST,
+            EUserActions.GO_TO_COORDINATES,
+            EUserActions.SET_TRACKING_MODE,
+            EUserActions.SET_ZONES,
+            EUserActions.RESET_PTZ_CALIBRATION,
+            EUserActions.LOCK_API,
+            EUserActions.UNLOCK_API,
+        ]),
+        postJsonBody: zod_1.z.any(),
+    }),
+    zod_1.z.object({
+        type: zod_1.z.literal('CONNECTED_USERS'),
+        users: zod_1.z.array(apiUserSchema),
+    }),
+    zod_1.z.object({
+        type: zod_1.z.literal('FORCE_TRACKING_STATUS'),
+        enabled: zod_1.z.boolean(),
+        icao: zod_1.z.string().optional(),
+    }),
+    zod_1.z.object({
+        type: zod_1.z.literal('API_LOCK_STATUS'),
+        isLocked: zod_1.z.boolean(),
+        user: apiUserSchema.optional(),
+    }),
+]);
+exports.ptrEventsSchema = zod_1.z.discriminatedUnion('type', [
+    zod_1.z.object({ type: zod_1.z.literal('init'), data: ptrEventsDataSchema }),
+    ...ptrEventsDataSchema.options,
+]);

package/cjs/web/DefaultClient.js

@@ -3,6 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DefaultClient = void 0;
 const utils_1 = require("../internal/utils");
 class DefaultClient {
+    domain;
+    constructor(domain = '') {
+        this.domain = domain;
+    }
     get = (params) => {
         return this.fetchWithTimeout((0, utils_1.addParametersToPath)(params.path, params.parameters), {
             method: 'GET',
@@ -16,11 +20,11 @@ class DefaultClient {
             headers: params.headers,
         }, params.timeout);
     };
-    async fetchWithTimeout(url, options, timeout) {
+    async fetchWithTimeout(path, options, timeout) {
         const controller = new AbortController();
         const timeoutId = timeout !== undefined ? setTimeout(() => controller.abort(), timeout) : null;
         try {
-            return await fetch(url, { ...options, signal: controller.signal });
+            return await fetch(`${this.domain}${path}`, { ...options, signal: controller.signal });
         }
         finally {
             if (timeoutId) {

package/cjs/web/WsClient.js

@@ -4,13 +4,11 @@ exports.WsClient = void 0;
 const REFRESH_TIMEOUT = 5000;
 class WsClient {
     getUrl;
-    getAuthToken;
     isDestroyed = false;
     ws = null;
     restartTimeout = null;
-    constructor(getUrl, getAuthToken) {
+    constructor(getUrl) {
         this.getUrl = getUrl;
-        this.getAuthToken = getAuthToken;
     }
     init() {
         if (this.isDestroyed) {
@@ -18,17 +16,9 @@ class WsClient {
         }
         this.destroyWebsocket();
         const ws = new WebSocket(this.getUrl(), 'events');
-        ws.onopen = async () => {
-            try {
-                const token = await this.getAuthToken();
-                ws.send(JSON.stringify({ authorization: token }));
-            }
-            catch (error) {
-                console.error('Error sending auth token:', error);
-                ws.close();
-            }
-        };
-        ws.onmessage = (e) => this.onmessage(e);
+        ws.binaryType = 'arraybuffer';
+        ws.onopen = () => this.onOpen();
+        ws.onmessage = (e) => this.onMessage(e.data);
         ws.onclose = () => {
             this.restartTimeout = window.setTimeout(() => this.init(), REFRESH_TIMEOUT);
         };
@@ -37,7 +27,15 @@ class WsClient {
     send = (msg) => {
         this.ws?.send(msg);
     };
-    onmessage = (_) => { };
+    onMessage = (_) => { };
+    onOpen = () => { };
+    onClose = () => { };
+    onError = (error) => {
+        console.error(error);
+    };
+    reconnect = () => {
+        this.ws?.close();
+    };
     destroy = () => {
         this.isDestroyed = true;
         this.destroyWebsocket();

package/cjs/ws/CamOverlayEvents.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CamOverlayEvents = void 0;
+const WsEvents_1 = require("../internal/WsEvents");
+const CamOverlayEvents_1 = require("../types/ws/CamOverlayEvents");
+class CamOverlayEvents extends WsEvents_1.WsEvents {
+    getAuthToken;
+    constructor(ws, getAuthToken) {
+        super(CamOverlayEvents_1.coEventsSchema, ws);
+        this.getAuthToken = getAuthToken;
+        this.ws.onOpen = this.sendInitMsg;
+    }
+    sendInitMsg = async () => {
+        try {
+            const token = await this.getAuthToken();
+            this.ws.send(JSON.stringify({ authorization: token }));
+        }
+        catch (error) {
+            console.error('Error on open:', error);
+            this.ws.reconnect();
+        }
+    };
+}
+exports.CamOverlayEvents = CamOverlayEvents;

package/cjs/ws/CamStreamerEvents.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CamStreamerEvents = void 0;
+const WsEvents_1 = require("../internal/WsEvents");
+const CamStreamerEvents_1 = require("../types/ws/CamStreamerEvents");
+class CamStreamerEvents extends WsEvents_1.WsEvents {
+    getAuthToken;
+    constructor(ws, getAuthToken) {
+        super(CamStreamerEvents_1.csEventsSchema, ws);
+        this.getAuthToken = getAuthToken;
+        this.ws.onOpen = this.sendInitMsg;
+    }
+    sendInitMsg = async () => {
+        try {
+            const token = await this.getAuthToken();
+            this.ws.send(JSON.stringify({ authorization: token }));
+        }
+        catch (error) {
+            console.error('Error on open:', error);
+            this.ws.reconnect();
+        }
+    };
+}
+exports.CamStreamerEvents = CamStreamerEvents;

package/cjs/ws/CamSwitcherEvents.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CamSwitcherEvents = void 0;
+const WsEvents_1 = require("../internal/WsEvents");
+const CamSwitcherEvents_1 = require("../types/ws/CamSwitcherEvents");
+class CamSwitcherEvents extends WsEvents_1.WsEvents {
+    getAuthToken;
+    constructor(ws, getAuthToken) {
+        super(CamSwitcherEvents_1.cswEventsSchema, ws);
+        this.getAuthToken = getAuthToken;
+        this.ws.onOpen = this.sendInitMsg;
+    }
+    sendInitMsg = async () => {
+        try {
+            const token = await this.getAuthToken();
+            this.ws.send(JSON.stringify({ authorization: token }));
+        }
+        catch (error) {
+            console.error('Error on open:', error);
+            this.ws.reconnect();
+        }
+    };
+}
+exports.CamSwitcherEvents = CamSwitcherEvents;

package/cjs/ws/PlaneTrackerEvents.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PlaneTrackerEvents = void 0;
+const WsEvents_1 = require("../internal/WsEvents");
+const PlaneTrackerEvents_1 = require("../types/ws/PlaneTrackerEvents");
+class PlaneTrackerEvents extends WsEvents_1.WsEvents {
+    _apiUser;
+    constructor(ws, _apiUser) {
+        super(PlaneTrackerEvents_1.ptrEventsSchema, ws);
+        this._apiUser = _apiUser;
+        this.ws.onOpen = this.sendInitMsg;
+    }
+    sendInitMsg = () => {
+        this.ws.send(JSON.stringify({
+            type: 'USER_INFO',
+            userId: this._apiUser.userId,
+            userName: this._apiUser.userName,
+            userPriority: this._apiUser.userPriority,
+        }));
+    };
+}
+exports.PlaneTrackerEvents = PlaneTrackerEvents;

package/esm/CamSwitcherAPI.js

@@ -19,7 +19,7 @@ export class CamSwitcherAPI {
     }
     static getProxyPath = () => `${BASE_PATH}/proxy.cgi`;
     static getWsEventsPath = () => `/local/camswitcher/events`;
-    static getClipPreviewPath = (id, storage) => `${BASE_PATH}/clip_preview.cgi?clip_name=${id}&storage=${storage}`;
+    static getClipPreviewPath = (clipId, storage) => `${BASE_PATH}/clip_preview.cgi?clip_name=${clipId}&storage=${storage}`;
     getClient(proxyParams) {
         return proxyParams ? new ProxyClient(this.client, proxyParams) : this.client;
     }

package/esm/PlaneTrackerAPI.js

@@ -1,6 +1,6 @@
 import { z } from 'zod';
 import { paramToUrl, responseStringify } from './internal/utils';
-import { blackListSchema, cameraSettingsSchema, flightInfoSchema, mapInfoSchema, priorityListSchema, serverSettingsSchema, trackingModeSchema, whiteListSchema, wsAliasResponseSchema, zonesSchema, } from './types/PlaneTrackerAPI';
+import { blackListSchema, cameraSettingsSchema, flightInfoSchema, getIcaoSchema, mapInfoSchema, priorityListSchema, serverSettingsSchema, trackingModeSchema, whiteListSchema, wsAliasResponseSchema, zonesSchema, } from './types/PlaneTrackerAPI';
 import { ImportSettingsError, ParsingBlobError, ResetCalibrationError } from './errors/errors';
 import { ProxyClient } from './internal/ProxyClient';
 import { cameraListSchema } from './types/GenetecAgent';
@@ -13,6 +13,7 @@ export class PlaneTrackerAPI {
         this.apiUser = apiUser;
     }
     static getProxyPath = () => `${BASE_PATH}/proxy.cgi`;
+    static getWsEventsPath = () => `${BASE_PATH}/package/ws`;
     getClient(proxyParams) {
         return proxyParams ? new ProxyClient(this.client, proxyParams) : this.client;
     }
@@ -110,6 +111,10 @@ export class PlaneTrackerAPI {
             timeout: options?.timeout,
         });
     }
+    async getIcao(by, value, options) {
+        const res = await this._getJson(`${BASE_PATH}/package/getIcao.cgi`, { [by]: value }, options);
+        return getIcaoSchema.parse(res).icao;
+    }
     async getPriorityList(options) {
         const res = await this._getJson(`${BASE_PATH}/package/getPriorityList.cgi`, undefined, options);
         return priorityListSchema.parse(res);
@@ -144,11 +149,11 @@ export class PlaneTrackerAPI {
     }
     async goToCoordinates(lat, lon, alt, options) {
         const agent = this.getClient(options?.proxyParams);
-        return await agent.get({
+        return (await agent.get({
             path: `${BASE_PATH}/package/goToCoordinates.cgi`,
             parameters: { lat, lon, alt, ...this.apiUser },
             timeout: options?.timeout,
-        });
+        }));
     }
     async checkGenetecConnection(params, options) {
         return await this._postUrlEncoded(`${BASE_PATH}/package/checkGenetecConnection.cgi`, params, options);

package/esm/index.js

@@ -4,17 +4,23 @@ export * from './internal/utils';
 export * from './internal/versionCompare';
 export * from './internal/ProxyClient';
 export * from './types/common';
-export { CamOverlayAPI } from './CamOverlayAPI';
-export * from './types/CamOverlayAPI';
-export { CamScripterAPI } from './CamScripterAPI';
-export * from './types/CamScripterAPI';
 export { CamStreamerAPI } from './CamStreamerAPI';
 export * from './types/CamStreamerAPI';
+export { CamStreamerEvents } from './ws/CamStreamerEvents';
+export * from './types/ws/CamStreamerEvents';
+export { CamOverlayAPI } from './CamOverlayAPI';
+export * from './types/CamOverlayAPI';
+export { CamOverlayEvents } from './ws/CamOverlayEvents';
+export * from './types/ws/CamOverlayEvents';
 export { CamSwitcherAPI } from './CamSwitcherAPI';
 export * from './types/CamSwitcherAPI';
-export { CamSwitcherEvents } from './CamSwitcherEvents';
-export * from './types/CamSwitcherEvents';
+export { CamSwitcherEvents } from './ws/CamSwitcherEvents';
+export * from './types/ws/CamSwitcherEvents';
 export { PlaneTrackerAPI } from './PlaneTrackerAPI';
 export * from './types/PlaneTrackerAPI';
+export { PlaneTrackerEvents } from './ws/PlaneTrackerEvents';
+export * from './types/ws/PlaneTrackerEvents';
+export { CamScripterAPI } from './CamScripterAPI';
+export * from './types/CamScripterAPI';
 export { VapixAPI } from './VapixAPI';
 export * from './types/VapixAPI';

package/esm/internal/WsEvents.js

@@ -6,7 +6,7 @@ export class WsEvents {
     constructor(zodSchema, ws) {
         this.zodSchema = zodSchema;
         this.ws = ws;
-        this.ws.onmessage = (e) => this.onMessage(e);
+        this.ws.onMessage = (e) => this.onMessage(e);
     }
     get isDestroyed() {
         return this._isDestroyed;
@@ -34,12 +34,12 @@ export class WsEvents {
             }
         }
     }
-    onMessage(evt) {
+    onMessage(incomeData) {
         if (this.isDestroyed) {
             return;
         }
         try {
-            const eventData = JSON.parse(evt.data);
+            const eventData = JSON.parse(incomeData.toString());
             const data = this.zodSchema.parse(eventData);
             if (isInitEvent(data)) {
                 this.processMessage(data.data, true);
@@ -48,7 +48,7 @@ export class WsEvents {
             this.processMessage(data, false);
         }
         catch (error) {
-            console.error('Error parsing event data:', evt.data, error);
+            console.error('Error parsing event data:', incomeData.toString(), error);
         }
     }
     processMessage(event, isInit) {
@@ -58,7 +58,8 @@ export class WsEvents {
     }
     destroy() {
         this._isDestroyed = true;
-        this.ws.onmessage = () => { };
+        this.ws.onMessage = () => { };
+        this.ws.onOpen = () => Promise.reject(new Error('Websocket is destroyed'));
         this.ws.destroy();
         this.listeners = {};
     }

package/esm/node/CamOverlayDrawingAPI.js

@@ -41,7 +41,7 @@ export class CamOverlayDrawingAPI extends EventEmitter {
         this.startMsgsTimeoutCheck();
     }
     disconnect() {
-        this.ws.close();
+        this.ws.destroy();
         this.stopMsgsTimeoutCheck();
     }
     isConnected() {
@@ -98,23 +98,23 @@ export class CamOverlayDrawingAPI extends EventEmitter {
             tlsInsecure: this.tlsInsecure,
         };
         this.ws = new WsClient(options);
-        this.ws.on('open', () => {
+        this.ws.onOpen = () => {
             console.log('CamOverlay connection opened');
             this.wsConnected = true;
             this.emit('open');
-        });
-        this.ws.on('message', (msgData) => this.incomingWsMessageHandler(msgData));
-        this.ws.on('error', (error) => {
+        };
+        this.ws.onMessage = (data) => this.incomingWsMessageHandler(data.toString());
+        this.ws.onError = (error) => {
             this.reportError(error);
-        });
-        this.ws.on('close', () => {
+        };
+        this.ws.onClose = () => {
             console.log('CamOverlay connection closed');
             this.wsConnected = false;
             this.reportClose();
-        });
+        };
     }
     incomingWsMessageHandler(msgData) {
-        const dataJSON = JSON.parse(msgData.toString());
+        const dataJSON = JSON.parse(msgData);
         let errorResponse;
         if ('error' in dataJSON) {
             errorResponse = dataJSON;
@@ -171,7 +171,7 @@ export class CamOverlayDrawingAPI extends EventEmitter {
                 headerView.setInt8(0, 1);
                 headerView.setInt32(1, jsonBuffer.byteLength);
                 const msgBuffer = Buffer.concat([Buffer.from(header), jsonBuffer, data]);
-                this.ws.send(msgBuffer);
+                this.ws.send(msgBuffer.buffer);
                 this.sendMessages[this.callId] = { resolve, reject, sentTimestamp: Date.now() };
             }
             catch (err) {

package/esm/node/CamScripterAPICameraEventsGenerator.js

@@ -31,7 +31,7 @@ export class CamScripterAPICameraEventsGenerator extends EventEmitter {
         this.startMsgsTimeoutCheck();
     }
     disconnect() {
-        this.ws.close();
+        this.ws.destroy();
         this.stopMsgsTimeoutCheck();
     }
     declareEvent(eventDeclaration) {
@@ -67,21 +67,21 @@ export class CamScripterAPICameraEventsGenerator extends EventEmitter {
             protocol: 'camera-events',
         };
         this.ws = new WsClient(options);
-        this.ws.on('open', () => {
+        this.ws.onOpen = () => {
             this.wsConnected = true;
             this.emit('open');
-        });
-        this.ws.on('message', (msgData) => this.incomingWsMessageHandler(msgData));
-        this.ws.on('error', (error) => {
+        };
+        this.ws.onMessage = (data) => this.incomingWsMessageHandler(data.toString());
+        this.ws.onError = (error) => {
             this.reportErr(error);
-        });
-        this.ws.on('close', () => {
+        };
+        this.ws.onClose = () => {
             this.wsConnected = false;
             this.reportClose();
-        });
+        };
     }
     incomingWsMessageHandler(msgData) {
-        const dataJSON = JSON.parse(msgData.toString());
+        const dataJSON = JSON.parse(msgData);
         let errorResponse;
         if ('error' in dataJSON) {
             errorResponse = dataJSON;

package/esm/node/Digest.test.js

@@ -0,0 +1,11 @@
+import { Digest } from './Digest';
+import { describe, test, expect } from '@jest/globals';
+describe('Digest', () => {
+    describe('getAuthHeader', () => {
+        test('Checks, that Digest.getAuthHeader() returns correct value.', () => {
+            const testString = 'Digest realm="testrealm@host.com", qop="auth,auth-int", nonce="dcd98b7102dd2f0e8b11d0f600bfb0c093", opaque="5ccc069c403ebaf9f0171e9517f40e41"';
+            const value = 'Digest username="root",realm="testrealm@host.com",nonce="dcd98b7102dd2f0e8b11d0f600bfb0c093",uri="www.cz",response="63f54af3ce5cf193a7435d5c68625472",qop=auth,nc=00000001,cnonce="162d50aa594e9648"';
+            expect(new Digest().getAuthHeader('root', 'pass', 'GET', 'www.cz', testString)).toBe(value);
+        });
+    });
+});

package/esm/node/VapixEvents.js

@@ -23,7 +23,7 @@ export class VapixEvents extends EventEmitter {
         this.ws.open();
     }
     disconnect() {
-        this.ws.close();
+        this.ws.destroy();
     }
     createWsClient() {
         const options = {
@@ -36,7 +36,7 @@ export class VapixEvents extends EventEmitter {
             address: '/vapix/ws-data-stream?sources=events',
         };
         this.ws = new WsClient(options);
-        this.ws.on('open', () => {
+        this.ws.onOpen = () => {
             const topics = [];
             const eventNames = this.eventNames();
             for (const eventName of eventNames) {
@@ -55,8 +55,8 @@ export class VapixEvents extends EventEmitter {
                 },
             };
             this.ws.send(JSON.stringify(topicFilter));
-        });
-        this.ws.on('message', (data) => {
+        };
+        this.ws.onMessage = (data) => {
             const dataJSON = JSON.parse(data.toString());
             if (dataJSON.method === 'events:configure') {
                 if (dataJSON.error === undefined) {
@@ -70,13 +70,13 @@ export class VapixEvents extends EventEmitter {
             }
             const eventName = dataJSON.params.notification.topic;
             this.emit(eventName, dataJSON);
-        });
-        this.ws.on('error', (error) => {
+        };
+        this.ws.onError = (error) => {
             this.emit('error', error);
-        });
-        this.ws.on('close', () => {
+        };
+        this.ws.onClose = () => {
             this.emit('close');
-        });
+        };
     }
     isReservedEventName(eventName) {
         return eventName === 'open' || eventName === 'close' || eventName === 'error';