camstreamerlib 4.0.0-beta.37 → 4.0.0-beta.39

package/README.md

@@ -15,32 +15,34 @@ Examples of CamScripter packages can be found at https://github.com/CamStreamer/
 npm install camstreamerlib
 ```
 
-# Documentation for Node.js modules
-
--   [HttpServer](doc/HttpServer.md) is a 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).
+# Documentation for ACAP and Camera API
 
 -   [VapixAPI](doc/VapixAPI.md) is a module to access Axis camera VAPIX interface.
 
--   [VapixEvents](doc/VapixEvents.md) is a module which allows receiving camera events from the VAPIX API.
-
 -   [CamStreamerAPI](doc/CamStreamerAPI.md) is a module for easy control of video streaming in the CamStreamer ACAP application (RTMP, HLS, SRT and MPEG-TS protocols).
 
 -   [CamOverlayAPI](doc/CamOverlayAPI.md) is a module to access CamOverlay API.
 
+-   [CamScripterAPI](doc/CamScripterAPI.md) is a module to access CamScripter API.
+
+-   [CamSwitcherAPI](doc/CamSwitcherAPI.md) is a module to access CamSwitcher API.
+
+-   [PlaneTrackerAPI](doc/PlaneTrackerAPI.md) is a module to access PlaneTracker API.
+
+# Documentation for Node.js modules
+
+-   [HttpServer](doc/HttpServer.md) is a 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) is a module which allows receiving camera events from the VAPIX API.
+
 -   [CamOverlayDrawingAPI](doc/CamOverlayDrawingAPI.md) is a 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.
 
--   [CamScripterAPI](doc/CamScripterAPI.md) is a module to access CamScripter API.
-
 -   [CamScripterAPICameraEventsGenerator](doc/CamScripterAPICameraEventsGenerator.md) is a 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.
 
--   [CamSwitcherAPI](doc/CamSwitcherAPI.md) is a module to access CamSwitcher API.
-
 -   [CamSwitcherEvents](doc/CamSwitcherEvents.md) is a module which allows receiving events from CamSwitcher ACAP application.
 
--   [PlaneTrackerAPI](doc/PlaneTrackerAPI.md) is a module to access PlaneTracker API.
-
 -   [GenetecAgent](doc/GenetecAgent.md) is a module which allows receiving and sending data to Genetec VMS.
 
 ## For Developers
@@ -65,7 +67,7 @@ If you want to create your own package and upload it to CamScripter App, you can
 
 ```json
 "scripts": {
-    "create-package": "node node_modules/camstreamerlib/CreatePackage.js"
+    "create-package": "node node_modules/camstreamerlib/bin/CreatePackage.js"
   }
 ```
 
@@ -77,29 +79,38 @@ The zip package is created in the current directory. You can choose different lo
 
 ```json
 "scripts": {
-    "create-package": "node node_modules/camstreamerlib/CreatePackage.js -i -e=react"
+    "create-package": "node node_modules/camstreamerlib/bin/CreatePackage.js -i -e=react"
 }
 ```
 
-### Breaking changes when moving from version 1.\*.\* to 2.\*.\*
+### Breaking changes when moving from version 3.\*.\* to 4.\*.\*
+
+...
 
--   Renamed file HTTPRequest.ts to HttpRequest.ts
--   Removed deprecated protocol attribute from all options objects (use tls instead).
--   Removed RTSP
-    > 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.
-    > Please read [CamOverlayAPI](doc/CamOverlayAPI.md) and [CamOverlayDrawingAPI](doc/CamOverlayDrawingAPI.md) for more information.
 
 ### 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.
-    > However, events `open` and `close` are still emitted in case you need to react to them.
+> [!IMPORTANT]
+> 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.
-    > 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.
+> [!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.\*.\*
+
+-   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.
+-   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.

package/cjs/CamOverlayAPI.js

@@ -20,68 +20,51 @@ class CamOverlayAPI {
         return proxyParams ? new ProxyClient_1.ProxyClient(this.client, proxyParams) : this.client;
     }
     async checkCameraTime(options) {
-        const response = await this._get({ path: `${BASE_PATH}/camera_time.cgi` }, options);
-        return zod_1.z.boolean().parse(response.state);
+        const res = await this._getJson(`${BASE_PATH}/camera_time.cgi`, undefined, options);
+        return zod_1.z.boolean().parse(res.state);
     }
     async getNetworkCameraList(options) {
-        const response = await this._get({ path: `${BASE_PATH}/network_camera_list.cgi` }, options);
-        return common_1.networkCameraListSchema.parse(response.camera_list);
+        const res = await this._getJson(`${BASE_PATH}/network_camera_list.cgi`, undefined, options);
+        return common_1.networkCameraListSchema.parse(res.camera_list);
     }
     async wsAuthorization(options) {
-        const response = await this._get({ path: `${BASE_PATH}/ws_authorization.cgi` }, options);
-        return CamOverlayAPI_1.WSResponseSchema.parse(response).message;
+        const res = await this._getJson(`${BASE_PATH}/ws_authorization.cgi`, undefined, options);
+        return CamOverlayAPI_1.wsResponseSchema.parse(res).message;
     }
     async getMjpegStreamImage(mjpegUrl, options) {
-        return await this._getBlob({
-            path: `${BASE_PATH}/fetch_mjpeg_image.cgi?mjpeg_url=${encodeURIComponent(decodeURIComponent(mjpegUrl))}`,
-        }, options);
+        return await this._getBlob(`${BASE_PATH}/fetch_mjpeg_image.cgi`, { mjpeg_url: decodeURIComponent(mjpegUrl) }, options);
     }
     async listFiles(fileType, options) {
-        const files = await this._get({
-            path: `${BASE_PATH}/upload_${fileType}.cgi`,
-            parameters: {
-                action: 'list',
-            },
-        }, options);
-        return CamOverlayAPI_1.fileListSchema.parse(files.list);
+        const res = await this._getJson(`${BASE_PATH}/upload_${fileType}.cgi`, { action: 'list' }, options);
+        return CamOverlayAPI_1.fileListSchema.parse(res.list);
     }
     async uploadFile(fileType, formData, storage, options) {
-        await this._post({
-            path: `${BASE_PATH}/upload_${fileType}.cgi`,
-            data: formData,
-            parameters: {
-                action: 'upload',
-                storage: storage,
-            },
+        await this._post(`${BASE_PATH}/upload_${fileType}.cgi`, formData, {
+            action: 'upload',
+            storage: storage,
         }, options);
     }
     async removeFile(fileType, fileParams, options) {
-        const path = `${BASE_PATH}/upload_${fileType}.cgi`;
-        await this._postUrlEncoded(path, {
+        await this._postUrlEncoded(`${BASE_PATH}/upload_${fileType}.cgi`, {
             action: 'remove',
             ...fileParams,
-        }, undefined, options);
+        }, options, undefined);
     }
     async getFileStorage(fileType, options) {
-        const data = await this._get({
-            path: `${BASE_PATH}/upload_${fileType}.cgi`,
-            parameters: {
-                action: 'get_storage',
-            },
-        }, options);
-        if (data.code !== 200) {
+        const res = await this._getJson(`${BASE_PATH}/upload_${fileType}.cgi`, { action: 'get_storage' }, options);
+        if (res.code !== 200) {
             throw new Error('Error occured while fetching file storage data');
         }
-        return CamOverlayAPI_1.storageDataListSchema.parse(data.list);
+        return CamOverlayAPI_1.storageDataListSchema.parse(res.list);
     }
     async getFilePreviewFromCamera(path, options) {
-        return await this._getBlob({ path: CamOverlayAPI.getFilePreviewPath(path) }, options);
+        return await this._getBlob(CamOverlayAPI.getFilePreviewPath(path), undefined, options);
     }
     async updateInfoticker(serviceId, text, options) {
-        await this._get({ path: `${BASE_PATH}/infoticker.cgi?service_id=${serviceId}&text=${text}` }, options);
+        await this._getJson(`${BASE_PATH}/infoticker.cgi`, { service_id: serviceId, text: text }, options);
     }
     async setEnabled(serviceId, enabled, options) {
-        await this._post({ path: `${BASE_PATH}/enabled.cgi?id_${serviceId}=${enabled ? 1 : 0}`, data: '' }, options);
+        await this._post(`${BASE_PATH}/enabled.cgi`, '', { [`id_${serviceId}`]: enabled ? 1 : 0 }, options);
     }
     async isEnabled(serviceId, options) {
         const agent = this.getClient(options?.proxyParams);
@@ -100,43 +83,27 @@ class CamOverlayAPI {
         }
     }
     async getSingleService(serviceId, options) {
-        const data = await this._get({
-            path: `${BASE_PATH}/services.cgi`,
-            parameters: {
-                action: 'get',
-                service_id: serviceId.toString(),
-            },
+        const res = await this._getJson(`${BASE_PATH}/services.cgi`, {
+            action: 'get',
+            service_id: serviceId,
         }, options);
-        return CamOverlayAPI_1.servicesSchema.parse(data);
+        return CamOverlayAPI_1.servicesSchema.parse(res);
     }
     async getServices(options) {
-        const serviceList = await this._get({
-            path: `${BASE_PATH}/services.cgi`,
-            parameters: {
-                action: 'get',
-            },
-        }, options);
-        const services = CamOverlayAPI_1.serviceListSchema.parse(serviceList).services;
-        services.forEach((service) => {
-            const parsedService = CamOverlayAPI_1.servicesSchema.safeParse(service);
-            if (!parsedService.success) {
-                console.warn(`[SERVICE SCHEMA MISMATCH]: Service ${service.name} (${service.id}) does not match the current schema, or is a hidden service.`);
-            }
-        });
+        const res = await this._getJson(`${BASE_PATH}/services.cgi`, { action: 'get' }, options);
+        const services = CamOverlayAPI_1.serviceListSchema.parse(res).services;
         return services;
     }
     async updateSingleService(service, options) {
-        const path = `${BASE_PATH}/services.cgi`;
-        await this._postJsonEncoded(path, JSON.stringify(service), {
+        await this._postJsonEncoded(`${BASE_PATH}/services.cgi`, JSON.stringify(service), {
             action: 'set',
-            service_id: service.id.toString(),
-        }, undefined, options);
+            service_id: service.id,
+        }, options, undefined);
     }
     async updateServices(services, options) {
-        const path = `${BASE_PATH}/services.cgi`;
-        await this._postJsonEncoded(path, JSON.stringify({ services: services }), {
+        await this._postJsonEncoded(`${BASE_PATH}/services.cgi`, JSON.stringify({ services: services }), {
             action: 'set',
-        }, undefined, options);
+        }, options, undefined);
     }
     updateCGText(serviceId, fields, options) {
         const params = {};
@@ -197,9 +164,9 @@ class CamOverlayAPI {
             throw new Error(await (0, utils_1.responseStringify)(res));
         }
     }
-    async _get(params, options) {
+    async _getJson(path, parameters, options) {
         const agent = this.getClient(options?.proxyParams);
-        const res = await agent.get({ ...params, timeout: options?.timeout });
+        const res = await agent.get({ path, parameters, timeout: options?.timeout });
         if (res.ok) {
             return await res.json();
         }
@@ -207,9 +174,9 @@ class CamOverlayAPI {
             throw new Error(await (0, utils_1.responseStringify)(res));
         }
     }
-    async _post(params, options) {
+    async _post(path, data, parameters, options, headers) {
         const agent = this.getClient(options?.proxyParams);
-        const res = await agent.post({ ...params, timeout: options?.timeout });
+        const res = await agent.post({ path, data, parameters, headers, timeout: options?.timeout });
         if (res.ok) {
             return await res.json();
         }
@@ -217,9 +184,9 @@ class CamOverlayAPI {
             throw new Error(await (0, utils_1.responseStringify)(res));
         }
     }
-    async _getBlob(params, options) {
+    async _getBlob(path, parameters, options) {
         const agent = this.getClient(options?.proxyParams);
-        const res = await agent.get({ ...params, timeout: options?.timeout });
+        const res = await agent.get({ path, parameters, timeout: options?.timeout });
         if (res.ok) {
             return await this.parseBlobResponse(res);
         }
@@ -235,14 +202,14 @@ class CamOverlayAPI {
             throw new errors_1.ParsingBlobError(err);
         }
     }
-    async _postUrlEncoded(path, params, headers, options) {
-        const data = (0, utils_1.paramToUrl)(params);
+    async _postUrlEncoded(path, parameters, options, headers) {
+        const data = (0, utils_1.paramToUrl)(parameters);
         const baseHeaders = { 'Content-Type': 'application/x-www-form-urlencoded' };
-        return this._post({ path, data, headers: { ...baseHeaders, ...headers } }, options);
+        return this._post(path, data, undefined, options, { ...baseHeaders, ...headers });
     }
-    async _postJsonEncoded(path, data, parameters, headers, options) {
+    async _postJsonEncoded(path, data, parameters, options, headers) {
         const baseHeaders = { 'Accept': 'application/json', 'Content-Type': 'application/json' };
-        return this._post({ path, data, parameters, headers: { ...baseHeaders, ...headers } }, options);
+        return this._post(path, data, parameters, options, { ...baseHeaders, ...headers });
     }
 }
 exports.CamOverlayAPI = CamOverlayAPI;

package/cjs/CamScripterAPI.js

@@ -11,51 +11,57 @@ class CamScripterAPI {
     constructor(client) {
         this.client = client;
     }
-    static getProxyUrlPath = () => `${BASE_PATH}/proxy.cgi`;
+    static getProxyPath = () => `${BASE_PATH}/proxy.cgi`;
     getClient(proxyParams) {
         return proxyParams ? new ProxyClient_1.ProxyClient(this.client, proxyParams) : this.client;
     }
     async checkCameraTime(options) {
-        const data = await this.get(`${BASE_PATH}/camera_time.cgi`, undefined, options);
-        return CamScripterAPI_1.cameraTimeResponseSchema.parse(data).state;
+        const res = await this._getJson(`${BASE_PATH}/camera_time.cgi`, undefined, options);
+        return CamScripterAPI_1.cameraTimeResponseSchema.parse(res).state;
     }
     async getNetworkCameraList(options) {
-        const data = await this.get(`${BASE_PATH}/network_camera_list.cgi`, undefined, options);
-        return common_1.networkCameraListSchema.parse(data.camera_list);
+        const res = await this._getJson(`${BASE_PATH}/network_camera_list.cgi`, undefined, options);
+        return common_1.networkCameraListSchema.parse(res.camera_list);
     }
     async getStorageInfo(options) {
-        const data = await this.get(`${BASE_PATH}/package/get_storage.cgi`, undefined, options);
-        return CamScripterAPI_1.storageSchema.parse(data);
+        const res = await this._getJson(`${BASE_PATH}/package/get_storage.cgi`, undefined, options);
+        return CamScripterAPI_1.storageSchema.parse(res);
     }
     async getPackageList(options) {
-        const data = await this.get(`${BASE_PATH}/package/list.cgi`, undefined, options);
-        return CamScripterAPI_1.packageInfoListSchema.parse(data);
+        const res = await this._getJson(`${BASE_PATH}/package/list.cgi`, undefined, options);
+        return CamScripterAPI_1.packageInfoListSchema.parse(res);
     }
     async installPackages(formData, storage, options) {
-        const data = await this.post(`${BASE_PATH}/package/install.cgi?storage=${storage}`, formData, undefined, options);
-        return CamScripterAPI_1.camscripterApiResponseSchema.parse(data);
+        const res = await this._post(`${BASE_PATH}/package/install.cgi`, formData, { storage: storage }, options);
+        return CamScripterAPI_1.camscripterApiResponseSchema.parse(res);
     }
     async uninstallPackage(packageId, options) {
-        const data = await this.get(`${BASE_PATH}/package/remove.cgi?package_name=${packageId}`, undefined, options);
-        return CamScripterAPI_1.camscripterApiResponseSchema.parse(data);
+        const res = await this._getJson(`${BASE_PATH}/package/remove.cgi`, { package_name: packageId }, options);
+        return CamScripterAPI_1.camscripterApiResponseSchema.parse(res);
     }
     async importSettings(packageId, formData, options) {
-        const data = await this.post(`${BASE_PATH}/package/data.cgi?action=IMPORT&package_name=${packageId}`, formData, undefined, options);
-        return CamScripterAPI_1.camscripterApiResponseSchema.parse(data);
+        const res = await this._post(`${BASE_PATH}/package/data.cgi`, formData, {
+            action: 'IMPORT',
+            package_name: packageId,
+        }, options);
+        return CamScripterAPI_1.camscripterApiResponseSchema.parse(res);
     }
     async exportSettings(packageId, formData, options) {
-        const data = await this.post(`${BASE_PATH}/package/data.cgi?action=EXPORT&package_name=${packageId}`, formData, undefined, options);
-        return CamScripterAPI_1.camscripterApiResponseSchema.parse(data);
+        const res = await this._post(`${BASE_PATH}/package/data.cgi`, formData, {
+            action: 'EXPORT',
+            package_name: packageId,
+        }, options);
+        return CamScripterAPI_1.camscripterApiResponseSchema.parse(res);
     }
     async getNodejsStatus(options) {
-        const data = await this.get(`${BASE_PATH}/diagnostics.cgi`, undefined, options);
-        return CamScripterAPI_1.nodeStateSchema.parse(data);
+        const res = await this._getJson(`${BASE_PATH}/diagnostics.cgi`, undefined, options);
+        return CamScripterAPI_1.nodeStateSchema.parse(res);
     }
     async installNodejs(storage, options) {
-        const data = await this.get(`${BASE_PATH}/node_update.cgi?storage=${storage}`, undefined, options);
-        return CamScripterAPI_1.camscripterApiResponseSchema.parse(data);
+        const res = await this._getJson(`${BASE_PATH}/node_update.cgi`, { storage: storage }, options);
+        return CamScripterAPI_1.camscripterApiResponseSchema.parse(res);
     }
-    async get(path, parameters, options) {
+    async _getJson(path, parameters, options) {
         const agent = this.getClient(options?.proxyParams);
         const res = await agent.get({ path, parameters, timeout: options?.timeout });
         if (res.ok) {
@@ -65,9 +71,9 @@ class CamScripterAPI {
             throw new Error(await (0, utils_1.responseStringify)(res));
         }
     }
-    async post(path, data, parameters, options) {
+    async _post(path, data, parameters, options, headers) {
         const agent = this.getClient(options?.proxyParams);
-        const res = await agent.post({ path, data, parameters, timeout: options?.timeout });
+        const res = await agent.post({ path, data, parameters, headers, timeout: options?.timeout });
         if (res.ok) {
             return await res.json();
         }

package/cjs/CamStreamerAPI.js

@@ -1,10 +1,7 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseCameraStreamResponse = exports.CamStreamerAPI = void 0;
-const zod_1 = __importDefault(require("zod"));
+const zod_1 = require("zod");
 const ProxyClient_1 = require("./internal/ProxyClient");
 const utils_1 = require("./internal/utils");
 const CamStreamerAPI_1 = require("./types/CamStreamerAPI");
@@ -17,28 +14,42 @@ class CamStreamerAPI {
     getClient(proxyParams) {
         return proxyParams ? new ProxyClient_1.ProxyClient(this.client, proxyParams) : this.client;
     }
+    async wsAuthorization(options) {
+        const res = await this._getJson(`${BASE_PATH}/ws_authorization.cgi`, undefined, options);
+        if (res.status !== 200) {
+            throw new Error(`Server error on ws authorization: ${res.message}`);
+        }
+        return zod_1.z.string().parse(res.data);
+    }
+    async getUtcTime(options) {
+        const res = await this._getJson(`${BASE_PATH}/get_utc_time.cgi`, undefined, options);
+        if (res.status !== 200) {
+            throw new Error(`Server error on get UTC time: ${res.message}`);
+        }
+        return zod_1.z.number().parse(res.data);
+    }
     async getStreamList(options) {
-        const streamListRes = await this.get(`${BASE_PATH}/stream/list.cgi`, undefined, options);
-        const list = zod_1.default.record(zod_1.default.string(), CamStreamerAPI_1.cameraStreamSchema).parse(streamListRes.data);
-        const res = {};
+        const res = await this._getJson(`${BASE_PATH}/stream/list.cgi`, undefined, options);
+        const list = zod_1.z.record(zod_1.z.string(), CamStreamerAPI_1.cameraStreamSchema).parse(res.data);
+        const streamList = {};
         for (const [key, data] of Object.entries(list)) {
             const streamId = parseInt(key);
-            res[streamId] = (0, exports.parseCameraStreamResponse)(data);
+            streamList[streamId] = (0, exports.parseCameraStreamResponse)(data);
         }
-        return res;
+        return streamList;
     }
     async getStream(streamId, options) {
-        const stream = await this.get(`${BASE_PATH}/stream/get.cgi?stream_id=${streamId}`, undefined, options);
-        const cameraData = CamStreamerAPI_1.cameraStreamSchema.parse(stream.data);
+        const res = await this._getJson(`${BASE_PATH}/stream/get.cgi`, { stream_id: streamId }, options);
+        const cameraData = CamStreamerAPI_1.cameraStreamSchema.parse(res.data);
         return (0, exports.parseCameraStreamResponse)(cameraData);
     }
     async getStreamParameter(streamId, paramName, options) {
-        const stream = await this.get(`${BASE_PATH}/stream/get.cgi?stream_id=${streamId}`, undefined, options);
-        return stream.data[paramName];
+        const res = await this._getJson(`${BASE_PATH}/stream/get.cgi`, { stream_id: streamId }, options);
+        return zod_1.z.string().parse(res.data[paramName]);
     }
     async setStream(streamId, params, options) {
         const { streamDelay, startTime, stopTime, ...rest } = params;
-        return await this.get(`${BASE_PATH}/stream/set.cgi`, {
+        return await this._getJson(`${BASE_PATH}/stream/set.cgi`, {
             stream_id: streamId,
             streamDelay: streamDelay ?? '',
             startTime: startTime ?? null,
@@ -47,31 +58,17 @@ class CamStreamerAPI {
         }, options);
     }
     async setStreamParameter(streamId, paramName, value, options) {
-        return await this.get(`${BASE_PATH}/stream/set.cgi?stream_id=${streamId}&${paramName}=${value}`, undefined, options);
+        return await this._getJson(`${BASE_PATH}/stream/set.cgi`, { stream_id: streamId, [paramName]: value }, options);
     }
     async isStreaming(streamId, options) {
-        const response = await this.get(`${BASE_PATH}/get_streamstat.cgi?stream_id=${streamId}`, undefined, options);
-        return response.data.is_streaming === 1;
+        const res = await this._getJson(`${BASE_PATH}/get_streamstat.cgi`, { stream_id: streamId }, options);
+        return res.data.is_streaming === 1;
     }
     async deleteStream(streamId, options) {
-        const res = await this.get(`${BASE_PATH}/stream/remove.cgi`, { stream_id: streamId }, options);
+        const res = await this._getJson(`${BASE_PATH}/stream/remove.cgi`, { stream_id: streamId }, options);
         return res.data.status === 200;
     }
-    async getWsAuthorization(options) {
-        const res = await this.get(`${BASE_PATH}/ws_authorization.cgi`, undefined, options);
-        if (res.status !== 200) {
-            throw new Error(`Server error on ws authorization: ${res.message}`);
-        }
-        return res.data;
-    }
-    async getUtcTime(options) {
-        const res = await this.get(`${BASE_PATH}/get_utc_time.cgi`, undefined, options);
-        if (res.status !== 200) {
-            throw new Error(`Server error on get UTC time: ${res.message}`);
-        }
-        return res.data;
-    }
-    async get(path, parameters, options) {
+    async _getJson(path, parameters, options) {
         const agent = this.getClient(options?.proxyParams);
         const res = await agent.get({ path, parameters, timeout: options?.timeout });
         if (res.ok) {