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

package/README.md

@@ -17,61 +17,154 @@ npm install camstreamerlib
 
 ## Documentation for ACAP and Camera API
 
-
-| API  | Description |
-| ------------- | ------------- |
-| [VapixAPI](doc/VapixAPI.md)  | Module to access Axis camera VAPIX interface. |
-| [CamStreamerAPI](doc/CamStreamerAPI.md)  | Module for easy control of video streaming in the CamStreamer ACAP application (RTMP, HLS, SRT and MPEG-TS protocols). |
-| [CamOverlayAPI](doc/CamOverlayAPI.md)  | Module to access CamOverlay API. |
-| [CamScripterAPI](doc/CamScripterAPI.md)  | Module to access CamScripter API. |
-| [CamSwitcherAPI](doc/CamSwitcherAPI.md)  | Module to access CamSwitcher API. |
-| [PlaneTrackerAPI](doc/PlaneTrackerAPI.md)  | Module to access PlaneTracker API. |
+| API                                                | Description                                                                                                            |
+| -------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------- |
+| [VapixAPI](doc/VapixAPI.md)                        | Module to access Axis camera VAPIX interface.                                                                          |
+| [CamStreamerAPI](doc/CamStreamerAPI.md)            | Module for easy control of video streaming in the CamStreamer ACAP application (RTMP, HLS, SRT and MPEG-TS protocols). |
+| [CamOverlayAPI](doc/CamOverlayAPI.md)              | Module to access CamOverlay API.                                                                                       |
+| [CamScripterAPI](doc/CamScripterAPI.md)            | Module to access CamScripter API.                                                                                      |
+| [CamSwitcherAPI](doc/CamSwitcherAPI.md)            | Module to access CamSwitcher API.                                                                                      |
+| [PlaneTrackerAPI](doc/PlaneTrackerAPI.md)          | Module to access PlaneTracker API.                                                                                     |
+| [CamStreamerEvents](doc/ws/CamStreamerEvents.md)   | Module which allows receiving events from CamStreamer ACAP application.                                                |
+| [OverlayEvents](doc/ws/OverlayEvents.md)           | Module which allows receiving events from Overlay ACAP application.                                                    |
+| [CamSwitcherEvents](doc/ws/CamSwitcherEvents.md)   | Module which allows receiving events from CamSwitcher ACAP application.                                                |
+| [PlaneTrackerEvents](doc/ws/PlaneTrackerEvents.md) | Module which allows receiving events from PlaneTracker ACAP application.                                               |
 
 ## Documentation for Node.js modules
 
-| Module  | Description |
-| ------------- | ------------- |
-| [HttpServer](doc/HttpServer.md)  | Module for processing HTTP requests in your scripts. It also automatically serves up the content from html directory or you can register paths which you can process by your own (e.g. `http://$CAMERA_IP/local/camscripter/proxy/$MY_PACKAGE_NAME/control.cgi`). |
-| [VapixEvents](doc/VapixEvents.md) | Module which allows receiving camera events from the VAPIX API. |
-| [CamOverlayDrawingAPI](doc/CamOverlayDrawingAPI.md) | Module for easy control of CamOverlay drawing API. For more details on supported video overlay drawing functions see https://camstreamer.com/camoverlay-api1 |
-| [CamOverlayPainter](doc/CamOverlayPainter.md) | Contains three modules which makes easier to use CamOverlayDrawingAPI. |
-| [CamScripterAPICameraEventsGenerator](doc/CamScripterAPICameraEventsGenerator.md) | Module which allows generating events on an Axis camera. These events can be used for triggers in the Axis camera rule engine (events/actions). It is also an easy way how to integrate events and metadata in VMS systems which support Axis camera events. |
-| [CamSwitcherEvents](doc/CamSwitcherEvents.md) | Module which allows receiving events from CamSwitcher ACAP application. |
-| [GenetecAgent](doc/GenetecAgent.md) | Module which allows receiving and sending data to Genetec VMS. |
+| Module                                                                            | Description                                                                                                                                                                                                                                                       |
+| --------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| [HttpServer](doc/HttpServer.md)                                                   | Module for processing HTTP requests in your scripts. It also automatically serves up the content from html directory or you can register paths which you can process by your own (e.g. `http://$CAMERA_IP/local/camscripter/proxy/$MY_PACKAGE_NAME/control.cgi`). |
+| [VapixEvents](doc/ws/VapixEvents.md)                                              | Module which allows receiving camera events from the VAPIX API.                                                                                                                                                                                                   |
+| [CamOverlayDrawingAPI](doc/CamOverlayDrawingAPI.md)                               | Module for easy control of CamOverlay drawing API. For more details on supported video overlay drawing functions see https://camstreamer.com/camoverlay-api1                                                                                                      |
+| [CamOverlayPainter](doc/CamOverlayPainter.md)                                     | Contains three modules which makes easier to use CamOverlayDrawingAPI.                                                                                                                                                                                            |
+| [CamScripterAPICameraEventsGenerator](doc/CamScripterAPICameraEventsGenerator.md) | Module which allows generating events on an Axis camera. These events can be used for triggers in the Axis camera rule engine (events/actions). It is also an easy way how to integrate events and metadata in VMS systems which support Axis camera events.      |
+| [GenetecAgent](doc/GenetecAgent.md)                                               | Module which allows receiving and sending data to Genetec VMS.                                                                                                                                                                                                    |
+
+</br>
+
+# Breaking Changes
+
+<details open>
+
+<summary>from version 3.\*.\* to 4.\*.\* (latest)</summary>
+
+### Breaking changes when moving from version 3.\*.\* to 4.\*.\* (latest)
+
+<hr/>
+
+### ACAP API Class Constructors Updated
+
+All ACAP API classes now **require a client instance to be passed into their constructors** instead of options object.
 
+-   This change improves flexibility by allowing you to use either the Node or Web client, depending on your environment.
 
-## Breaking changes when moving from version 3.\*.\* to 4.\*.\* (latest)
+Example (before → now):
 
-...
+```typescript
+// Before
+const coApi = new CamOverlayAPI({
+    ip?: string;
+    port?: number;
+    user?: string;
+    pass?: string;
+    tls?: boolean;
+    tlsInsecure?: boolean;
+    keepAlive?: boolean
+});
+
+// Now
+import { DefaultClient } from 'camstreamerlib/web';
+import { CamOverlayAPI } from 'camstreamerlib';
+
+const coApi = new CamOverlayAPI(
+    new DefaultClient({
+        tls: false,
+        tlsInsecure: false,
+        ip: '127.0.0.1',
+        port: 80,
+        user: '',
+        pass: '',
+    })
+);
+```
+
+### Imports Simplified
+
+Importing from the camstreamerlib is now much easier -> all exports are now re-exported from the root index.js.
+You no longer need to import from subpaths.
+
+Example:
+
+```typescript
+// Before
+import { CamScripterAPI } from 'camstreamerlib/CamScripterAPI';
+import { Painter } from 'camstreamerlib/CamOverlayPainter/Painter';
+import { DefaultAgent } from 'camstreamerlib/DefaultAgent';
+
+// Now
+import { CamScripterAPI } from 'camstreamerlib';
+import { Painter } from 'camstreamerlib/node';
+import { DefaultClient } from 'camstreamerlib/web';
+```
 
+> Note: To ensure compatibility, set the module resolution in your projects tsconfig.json to `"moduleResolution": "bundler"`.
 
-## Breaking changes when moving from version 2.\*.\* to 3.\*.\*
+### Class and Method Refactored
+
+-   **CameraVapix API** has been renamed to [**VapixAPI**](doc/VapixAPI.md).
+-   **DefaultAgent** has been refactored into two separate classes - one for node, one for web as [**DefaultClient**](doc/Client.md)
+-   Several method names and parameter names across the library have been updated for consistency and clarity.
+
+> Please refer to [the documentation](#documentation-for-acap-and-camera-api).
+
+-   New API modules and endpoints have been introduced, providing extended functionality and better coverage of the underlying service.
+
+<hr/>
+</details>
+
+<details>
+
+<summary>from version 2.\*.\* to 3.\*.\*</summary>
+
+### Breaking changes when moving from version 2.\*.\* to 3.\*.\*
 
 -   CamStreamerlib requiers Node.js version 18 or higher.
 -   CamOverlayDrawingAPI tries to reconnect when the websocket is closed. You don't have to do it manually.
-> [!NOTE]
-> However, events `open` and `close` are still emitted in case you need to react to them.
+
+    > However, events `open` and `close` are still emitted in case you need to react to them.
+
 -   Files `common.ts`, `Digest.ts`, `HttpRequest.ts` and `WsClient.ts` moved to a folder internal.
 -   Removed function `httpRequest()`. Use `sendRequest()` instead. It uses the same interface except for the "noWaitForData" parameter.
-> [!IMPORTANT]
+
 > It returns (Response object)[https://developer.mozilla.org/en-US/docs/Web/API/Response] which doesn't contain data by default.
 > If you need to wait for data, you can call for example the function `await res.text()`.
 > This change affects the function `vapixGet` from (CameraVapix)[doc/CameraVapix.md] too.
 
-## Breaking changes when moving from version 1.\*.\* to 2.\*.\*
+<hr/>
+</details>
+
+<details>
+
+<summary>from version 1.\*.\* to 2.\*.\**</summary>
+
+### Breaking changes when moving from version 1.\*.\* to 2.\*.\*
 
 -   Renamed file HTTPRequest.ts to HttpRequest.ts
 -   Removed deprecated protocol attribute from all options objects (use tls instead).
 -   Removed RTSP
-> [!IMPORTANT]
-> Previously CameraVapix.ts supported both WebSocket and RTSP.
-> Starting with version 2.0.0, it supports WebSocket only.
+
+    > Previously CameraVapix.ts supported both WebSocket and RTSP.
+    > Starting with version 2.0.0, it supports WebSocket only.
+
 -   ServiceID shouldn't be passed to CamOverlayAPI by the options object. Pass it as a parameter.
 -   Renamed CamOverlayDrawingAPI event msg to message.
 -   Drawing services extracted from CamOverlayAPI.ts to a separate file.
-> [!IMPORTANT]
+
 > Please read [CamOverlayAPI](doc/CamOverlayAPI.md) and [CamOverlayDrawingAPI](doc/CamOverlayDrawingAPI.md) for more information.
 
+</details>
+</br>
 
 # For Developers
 
@@ -109,4 +202,4 @@ The zip package is created in the current directory. You can choose different lo
 "scripts": {
     "create-package": "node node_modules/camstreamerlib/bin/CreatePackage.js -i -e=react"
 }
-```
+```

package/cjs/CamSwitcherAPI.js

@@ -22,7 +22,7 @@ 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_1.ProxyClient(this.client, proxyParams) : this.client;
     }

package/cjs/PlaneTrackerAPI.js

@@ -16,6 +16,7 @@ class PlaneTrackerAPI {
         this.apiUser = apiUser;
     }
     static getProxyPath = () => `${BASE_PATH}/proxy.cgi`;
+    static getWsEventsPath = () => `${BASE_PATH}/package/ws`;
     getClient(proxyParams) {
         return proxyParams ? new ProxyClient_1.ProxyClient(this.client, proxyParams) : this.client;
     }
@@ -113,6 +114,10 @@ class PlaneTrackerAPI {
             timeout: options?.timeout,
         });
     }
+    async getIcao(by, value, options) {
+        const res = await this._getJson(`${BASE_PATH}/package/getIcao.cgi`, { [by]: value }, options);
+        return PlaneTrackerAPI_1.getIcaoSchema.parse(res).icao;
+    }
     async getPriorityList(options) {
         const res = await this._getJson(`${BASE_PATH}/package/getPriorityList.cgi`, undefined, options);
         return PlaneTrackerAPI_1.priorityListSchema.parse(res);
@@ -147,11 +152,11 @@ 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/cjs/index.js

@@ -14,31 +14,40 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.VapixAPI = exports.PlaneTrackerAPI = exports.CamSwitcherEvents = exports.CamSwitcherAPI = exports.CamStreamerAPI = exports.CamScripterAPI = exports.CamOverlayAPI = void 0;
+exports.VapixAPI = exports.CamScripterAPI = exports.PlaneTrackerEvents = exports.PlaneTrackerAPI = exports.CamSwitcherEvents = exports.CamSwitcherAPI = exports.CamOverlayEvents = exports.CamOverlayAPI = exports.CamStreamerEvents = exports.CamStreamerAPI = void 0;
 __exportStar(require("./internal/types"), exports);
 __exportStar(require("./internal/constants"), exports);
 __exportStar(require("./internal/utils"), exports);
 __exportStar(require("./internal/versionCompare"), exports);
 __exportStar(require("./internal/ProxyClient"), exports);
 __exportStar(require("./types/common"), exports);
-var CamOverlayAPI_1 = require("./CamOverlayAPI");
-Object.defineProperty(exports, "CamOverlayAPI", { enumerable: true, get: function () { return CamOverlayAPI_1.CamOverlayAPI; } });
-__exportStar(require("./types/CamOverlayAPI"), exports);
-var CamScripterAPI_1 = require("./CamScripterAPI");
-Object.defineProperty(exports, "CamScripterAPI", { enumerable: true, get: function () { return CamScripterAPI_1.CamScripterAPI; } });
-__exportStar(require("./types/CamScripterAPI"), exports);
 var CamStreamerAPI_1 = require("./CamStreamerAPI");
 Object.defineProperty(exports, "CamStreamerAPI", { enumerable: true, get: function () { return CamStreamerAPI_1.CamStreamerAPI; } });
 __exportStar(require("./types/CamStreamerAPI"), exports);
+var CamStreamerEvents_1 = require("./ws/CamStreamerEvents");
+Object.defineProperty(exports, "CamStreamerEvents", { enumerable: true, get: function () { return CamStreamerEvents_1.CamStreamerEvents; } });
+__exportStar(require("./types/ws/CamStreamerEvents"), exports);
+var CamOverlayAPI_1 = require("./CamOverlayAPI");
+Object.defineProperty(exports, "CamOverlayAPI", { enumerable: true, get: function () { return CamOverlayAPI_1.CamOverlayAPI; } });
+__exportStar(require("./types/CamOverlayAPI"), exports);
+var CamOverlayEvents_1 = require("./ws/CamOverlayEvents");
+Object.defineProperty(exports, "CamOverlayEvents", { enumerable: true, get: function () { return CamOverlayEvents_1.CamOverlayEvents; } });
+__exportStar(require("./types/ws/CamOverlayEvents"), exports);
 var CamSwitcherAPI_1 = require("./CamSwitcherAPI");
 Object.defineProperty(exports, "CamSwitcherAPI", { enumerable: true, get: function () { return CamSwitcherAPI_1.CamSwitcherAPI; } });
 __exportStar(require("./types/CamSwitcherAPI"), exports);
-var CamSwitcherEvents_1 = require("./CamSwitcherEvents");
+var CamSwitcherEvents_1 = require("./ws/CamSwitcherEvents");
 Object.defineProperty(exports, "CamSwitcherEvents", { enumerable: true, get: function () { return CamSwitcherEvents_1.CamSwitcherEvents; } });
-__exportStar(require("./types/CamSwitcherEvents"), exports);
+__exportStar(require("./types/ws/CamSwitcherEvents"), exports);
 var PlaneTrackerAPI_1 = require("./PlaneTrackerAPI");
 Object.defineProperty(exports, "PlaneTrackerAPI", { enumerable: true, get: function () { return PlaneTrackerAPI_1.PlaneTrackerAPI; } });
 __exportStar(require("./types/PlaneTrackerAPI"), exports);
+var PlaneTrackerEvents_1 = require("./ws/PlaneTrackerEvents");
+Object.defineProperty(exports, "PlaneTrackerEvents", { enumerable: true, get: function () { return PlaneTrackerEvents_1.PlaneTrackerEvents; } });
+__exportStar(require("./types/ws/PlaneTrackerEvents"), exports);
+var CamScripterAPI_1 = require("./CamScripterAPI");
+Object.defineProperty(exports, "CamScripterAPI", { enumerable: true, get: function () { return CamScripterAPI_1.CamScripterAPI; } });
+__exportStar(require("./types/CamScripterAPI"), exports);
 var VapixAPI_1 = require("./VapixAPI");
 Object.defineProperty(exports, "VapixAPI", { enumerable: true, get: function () { return VapixAPI_1.VapixAPI; } });
 __exportStar(require("./types/VapixAPI"), exports);

package/cjs/internal/WsEvents.js

@@ -9,7 +9,7 @@ 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;
@@ -37,12 +37,12 @@ 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);
@@ -51,7 +51,7 @@ 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) {
@@ -61,7 +61,8 @@ 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/cjs/node/CamOverlayDrawingAPI.js

@@ -47,7 +47,7 @@ class CamOverlayDrawingAPI extends events_1.default {
         this.startMsgsTimeoutCheck();
     }
     disconnect() {
-        this.ws.close();
+        this.ws.destroy();
         this.stopMsgsTimeoutCheck();
     }
     isConnected() {
@@ -104,23 +104,23 @@ class CamOverlayDrawingAPI extends events_1.default {
             tlsInsecure: this.tlsInsecure,
         };
         this.ws = new WsClient_1.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;
@@ -177,7 +177,7 @@ class CamOverlayDrawingAPI extends events_1.default {
                 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/cjs/node/CamScripterAPICameraEventsGenerator.js

@@ -37,7 +37,7 @@ class CamScripterAPICameraEventsGenerator extends events_1.default {
         this.startMsgsTimeoutCheck();
     }
     disconnect() {
-        this.ws.close();
+        this.ws.destroy();
         this.stopMsgsTimeoutCheck();
     }
     declareEvent(eventDeclaration) {
@@ -73,21 +73,21 @@ class CamScripterAPICameraEventsGenerator extends events_1.default {
             protocol: 'camera-events',
         };
         this.ws = new WsClient_1.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/cjs/node/Digest.test.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const Digest_1 = require("./Digest");
+const globals_1 = require("@jest/globals");
+(0, globals_1.describe)('Digest', () => {
+    (0, globals_1.describe)('getAuthHeader', () => {
+        (0, globals_1.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"';
+            (0, globals_1.expect)(new Digest_1.Digest().getAuthHeader('root', 'pass', 'GET', 'www.cz', testString)).toBe(value);
+        });
+    });
+});

package/cjs/node/VapixEvents.js

@@ -26,7 +26,7 @@ class VapixEvents extends eventemitter2_1.EventEmitter2 {
         this.ws.open();
     }
     disconnect() {
-        this.ws.close();
+        this.ws.destroy();
     }
     createWsClient() {
         const options = {
@@ -39,7 +39,7 @@ class VapixEvents extends eventemitter2_1.EventEmitter2 {
             address: '/vapix/ws-data-stream?sources=events',
         };
         this.ws = new WsClient_1.WsClient(options);
-        this.ws.on('open', () => {
+        this.ws.onOpen = () => {
             const topics = [];
             const eventNames = this.eventNames();
             for (const eventName of eventNames) {
@@ -58,8 +58,8 @@ class VapixEvents extends eventemitter2_1.EventEmitter2 {
                 },
             };
             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) {
@@ -73,13 +73,13 @@ class VapixEvents extends eventemitter2_1.EventEmitter2 {
             }
             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';

package/cjs/node/WsClient.js

@@ -4,10 +4,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WsClient = void 0;
-const events_1 = __importDefault(require("events"));
 const ws_1 = __importDefault(require("ws"));
 const Digest_1 = require("./Digest");
-class WsClient extends events_1.default {
+class WsClient {
     user;
     pass;
     address;
@@ -20,7 +19,6 @@ class WsClient extends events_1.default {
     ws;
     isClosed = false;
     constructor(options) {
-        super();
         const tls = options.tls ?? false;
         const tlsInsecure = options.tlsInsecure ?? false;
         const ip = options.ip ?? '127.0.0.1';
@@ -52,10 +50,10 @@ class WsClient extends events_1.default {
             }
             this.ws.binaryType = 'arraybuffer';
             this.isAlive = true;
-            this.pingTimer = setInterval(async () => {
+            this.pingTimer = setInterval(() => {
                 if ((this.ws && this.ws.readyState !== ws_1.default.OPEN) || this.isAlive === false) {
-                    this.emit('error', new Error('Connection timeout'));
-                    await this.closeWsConnection();
+                    this.onError(new Error('Connection timeout'));
+                    this.closeWsConnection();
                 }
                 else {
                     this.isAlive = false;
@@ -78,23 +76,32 @@ class WsClient extends events_1.default {
                     this.open(res.headers['www-authenticate']);
                 }
                 else {
-                    this.emit('error', new Error('Status code: ' + res.statusCode));
+                    this.onError(new Error('Status code: ' + res.statusCode));
                     this.closeWsConnection();
                 }
             });
-            this.ws.on('open', () => this.emit('open'));
-            this.ws.on('message', (data) => this.emit('message', data));
+            this.ws.on('open', () => this.onOpen());
+            this.ws.on('message', (data, isBinary) => {
+                const message = isBinary ? data : data.toString();
+                this.onMessage(message);
+            });
             this.ws.on('error', (error) => {
-                this.emit('error', error);
+                this.onError(error);
                 this.closeWsConnection();
             });
             this.ws.on('close', () => this.closeWsConnection());
         }
         catch (error) {
-            this.emit('error', error instanceof Error ? error : new Error('Unknown error'));
+            this.onError(error instanceof Error ? error : new Error('Unknown error'));
             this.closeWsConnection();
         }
     }
+    onMessage = (_) => { };
+    onOpen = () => { };
+    onClose = () => { };
+    onError = (error) => {
+        console.error(error);
+    };
     send(data) {
         if (this.ws === undefined) {
             throw new Error("This websocket hasn't been opened yet.");
@@ -103,7 +110,7 @@ class WsClient extends events_1.default {
             this.ws.send(data);
         }
     }
-    close() {
+    destroy() {
         if (this.isClosed) {
             return;
         }
@@ -133,7 +140,7 @@ class WsClient extends events_1.default {
                     wsCopy.terminate();
                 }
             }, 5000);
-            this.emit('close');
+            this.onClose();
         }
         catch (err) {
             console.error(err);

package/cjs/types/CamOverlayAPI/pipSchema.js

@@ -27,7 +27,7 @@ exports.pipSchema = serviceCommonTypes_1.serviceCommonSchema.extend({
         zod_1.z.literal('overlays=image'),
         zod_1.z.literal('overlays=application'),
     ]),
-    rotate: zod_1.z.union([zod_1.z.literal(0), zod_1.z.literal(90), zod_1.z.literal(180), zod_1.z.literal(270)]),
+    rotate: zod_1.z.union([zod_1.z.literal(0), zod_1.z.literal(90), zod_1.z.literal(180), zod_1.z.literal(270)]).default(0),
     dewarping: zod_1.z.object({
         enabled: zod_1.z.boolean(),
         rectangle: zod_1.z.array(zod_1.z.tuple([zod_1.z.number(), zod_1.z.number()])),

package/cjs/types/PlaneTrackerAPI.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.zonesSchema = exports.mapInfoSchema = exports.mapTypeSchema = exports.blackListSchema = exports.whiteListSchema = exports.priorityListSchema = exports.flightInfoSchema = exports.trackingModeSchema = exports.serverSettingsSchema = exports.cameraSettingsSchema = exports.widgetSchema = exports.connectionSchema = exports.wsAliasResponseSchema = void 0;
+exports.zonesSchema = exports.mapInfoSchema = exports.mapTypeSchema = exports.blackListSchema = exports.whiteListSchema = exports.priorityListSchema = exports.flightInfoSchema = exports.trackingModeSchema = exports.getIcaoSchema = exports.serverSettingsSchema = exports.cameraSettingsSchema = exports.widgetSchema = exports.connectionSchema = exports.wsAliasResponseSchema = void 0;
 const zod_1 = require("zod");
 exports.wsAliasResponseSchema = zod_1.z.object({
     alias: zod_1.z.string(),
@@ -234,6 +234,9 @@ exports.serverSettingsSchema = zod_1.z.object({
         tiltRealKnownPoint: 90,
     }),
 });
+exports.getIcaoSchema = zod_1.z.object({
+    icao: zod_1.z.string(),
+});
 exports.trackingModeSchema = zod_1.z.object({
     mode: zod_1.z.union([zod_1.z.literal('MANUAL'), zod_1.z.literal('AUTOMATIC')]),
 });

package/cjs/types/ws/CamOverlayEvents.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.coEventsSchema = void 0;
+const zod_1 = require("zod");
+const coEventsDataSchema = 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('ServiceStart'),
+        serviceId: zod_1.z.number(),
+    }),
+    zod_1.z.object({
+        type: zod_1.z.literal('ServiceStop'),
+        serviceId: zod_1.z.number(),
+    }),
+]);
+exports.coEventsSchema = zod_1.z.discriminatedUnion('type', [
+    zod_1.z.object({ type: zod_1.z.literal('init'), data: coEventsDataSchema }),
+    ...coEventsDataSchema.options,
+]);