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

package/cjs/CamSwitcherAPI.js

@@ -20,9 +20,9 @@ class CamSwitcherAPI {
         this.CustomFormData = CustomFormData;
         this.vapixAgent = new VapixAPI_1.VapixAPI(client);
     }
-    static getProxyUrlPath = () => `${BASE_PATH}/proxy.cgi`;
-    static getWsEventsUrlPath = () => `/local/camswitcher/events`;
-    static getClipPreviewUrlPath = (id, storage) => `${BASE_PATH}/clip_preview.cgi?clip_name=${id}&storage=${storage}`;
+    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}`;
     getClient(proxyParams) {
         return proxyParams ? new ProxyClient_1.ProxyClient(this.client, proxyParams) : this.client;
     }
@@ -38,98 +38,105 @@ class CamSwitcherAPI {
         });
     }
     async checkCameraTime(options) {
-        const data = await this.get(`${BASE_PATH}/camera_time.cgi`, undefined, options);
-        return zod_1.z.boolean().parse(data);
+        const res = await this._getJson(`${BASE_PATH}/camera_time.cgi`, undefined, options);
+        return zod_1.z.boolean().parse(res.data);
     }
     async getNetworkCameraList(options) {
-        const data = await this.get(`${BASE_PATH}/network_camera_list.cgi`, undefined, options);
-        return common_1.networkCameraListSchema.parse(data);
+        const res = await this._getJson(`${BASE_PATH}/network_camera_list.cgi`, undefined, options);
+        return common_1.networkCameraListSchema.parse(res.data);
     }
     async getMaxFps(source, options) {
-        const data = await this.get(`${BASE_PATH}/get_max_framerate.cgi`, {
-            video_source: source.toString(),
+        const res = await this._getJson(`${BASE_PATH}/get_max_framerate.cgi`, {
+            video_source: source,
         }, options);
-        return zod_1.z.number().parse(data);
+        return zod_1.z.number().parse(res.data);
     }
     async getStorageInfo(options) {
-        const data = await this.get(`${BASE_PATH}/get_storage.cgi`, undefined, options);
-        return CamSwitcherAPI_1.storageInfoListSchema.parse(data);
+        const res = await this._getJson(`${BASE_PATH}/get_storage.cgi`, undefined, options);
+        return CamSwitcherAPI_1.storageInfoListSchema.parse(res.data);
     }
     async wsAuthorization(options) {
-        const data = await this.get(`${BASE_PATH}/ws_authorization.cgi`, undefined, options);
-        return zod_1.z.string().parse(data);
+        const res = await this._getJson(`${BASE_PATH}/ws_authorization.cgi`, undefined, options);
+        return zod_1.z.string().parse(res.data);
     }
     async getOutputInfo(options) {
-        const data = await this.get(`${BASE_PATH}/output_info.cgi`, undefined, options);
-        return CamSwitcherAPI_1.outputInfoSchema.parse(data);
+        const res = await this._getJson(`${BASE_PATH}/output_info.cgi`, undefined, options);
+        return CamSwitcherAPI_1.outputInfoSchema.parse(res.data);
     }
     async getAudioPushInfo(options) {
-        const data = await this.get(`${BASE_PATH}/audio_push_info.cgi`, undefined, options);
-        return CamSwitcherAPI_1.audioPushInfoSchema.parse(data);
+        const res = await this._getJson(`${BASE_PATH}/audio_push_info.cgi`, undefined, options);
+        return CamSwitcherAPI_1.audioPushInfoSchema.parse(res.data);
     }
     async getStreamSaveList(options) {
-        const data = await this.get(`${BASE_PATH}/streams.cgi`, { action: 'get' }, options);
-        return CamSwitcherAPI_1.streamSaveLoadSchema.parse(data);
+        const res = await this._getJson(`${BASE_PATH}/streams.cgi`, { action: 'get' }, options);
+        return CamSwitcherAPI_1.streamSaveLoadSchema.parse(res.data);
     }
     async getClipSaveList(options) {
-        const data = await this.get(`${BASE_PATH}/clips.cgi`, { action: 'get' }, options);
-        return CamSwitcherAPI_1.clipSaveLoadSchema.parse(data);
+        const res = await this._getJson(`${BASE_PATH}/clips.cgi`, { action: 'get' }, options);
+        return CamSwitcherAPI_1.clipSaveLoadSchema.parse(res.data);
     }
     async getPlaylistSaveList(options) {
-        const data = await this.get(`${BASE_PATH}/playlists.cgi`, { action: 'get' }, options);
-        return CamSwitcherAPI_1.playlistSaveLoadSchema.parse(data);
+        const res = await this._getJson(`${BASE_PATH}/playlists.cgi`, { action: 'get' }, options);
+        return CamSwitcherAPI_1.playlistSaveLoadSchema.parse(res.data);
     }
     async getTrackerSaveList(options) {
-        const data = await this.get(`${BASE_PATH}/trackers.cgi`, { action: 'get' }, options);
-        return CamSwitcherAPI_1.trackerSaveLoadSchema.parse(data);
+        const res = await this._getJson(`${BASE_PATH}/trackers.cgi`, { action: 'get' }, options);
+        return CamSwitcherAPI_1.trackerSaveLoadSchema.parse(res.data);
     }
     async setStreamSaveList(data, options) {
-        return await this.set(`${BASE_PATH}/streams.cgi`, data, { action: 'set' }, options);
+        return await this._post(`${BASE_PATH}/streams.cgi`, data, { action: 'set' }, options);
     }
     async setClipSaveList(data, options) {
-        return await this.set(`${BASE_PATH}/clips.cgi`, data, { action: 'set' }, options);
+        return await this._post(`${BASE_PATH}/clips.cgi`, data, { action: 'set' }, options);
     }
     async setPlaylistSaveList(data, options) {
-        return await this.set(`${BASE_PATH}/playlists.cgi`, data, { action: 'set' }, options);
+        return await this._post(`${BASE_PATH}/playlists.cgi`, data, { action: 'set' }, options);
     }
     async setTrackerSaveList(data, options) {
-        return await this.set(`${BASE_PATH}/trackers.cgi`, data, { action: 'set' }, options);
+        return await this._post(`${BASE_PATH}/trackers.cgi`, data, { action: 'set' }, options);
     }
     async playlistSwitch(playlistName, options) {
-        await this.get(`${BASE_PATH}/playlist_switch.cgi`, { playlist_name: playlistName }, options);
+        await this._getJson(`${BASE_PATH}/playlist_switch.cgi`, { playlist_name: playlistName }, options);
     }
     async playlistQueuePush(playlistName, options) {
-        await this.get(`${BASE_PATH}/playlist_queue_push.cgi`, { playlist_name: playlistName }, options);
+        await this._getJson(`${BASE_PATH}/playlist_queue_push.cgi`, { playlist_name: playlistName }, options);
     }
     async playlistQueueClear(options) {
-        await this.get(`${BASE_PATH}/playlist_queue_clear.cgi`, undefined, options);
+        await this._getJson(`${BASE_PATH}/playlist_queue_clear.cgi`, undefined, options);
     }
     async playlistQueueList(options) {
-        const data = await this.get(`${BASE_PATH}/playlist_queue_list.cgi`, undefined, options);
-        return CamSwitcherAPI_1.playlistQueueSchema.parse(data).playlistQueueList;
+        const res = await this._getJson(`${BASE_PATH}/playlist_queue_list.cgi`, undefined, options);
+        return CamSwitcherAPI_1.playlistQueueSchema.parse(res.data).playlistQueueList;
     }
     async playlistQueuePlayNext(options) {
-        await this.get(`${BASE_PATH}/playlist_queue_play_next.cgi`, undefined, options);
+        await this._getJson(`${BASE_PATH}/playlist_queue_play_next.cgi`, undefined, options);
     }
     async addNewClip(file, clipType, storage, clipId, fileName, options) {
-        const path = `${BASE_PATH}/clip_upload.cgi?storage=${storage}`;
+        const path = `${BASE_PATH}/clip_upload.cgi`;
         const formData = new this.CustomFormData();
         formData.append('clip_name', clipId);
         formData.append('clip_type', clipType);
         formData.append('file', file, fileName);
         const agent = this.getClient(options?.proxyParams);
-        const res = await agent.post({ path, data: formData, timeout: options?.timeout });
+        const res = await agent.post({
+            path,
+            data: formData,
+            parameters: {
+                storage: storage,
+            },
+            timeout: options?.timeout,
+        });
         const output = (await res.json());
         if (output.status !== 200) {
             throw new errors_1.AddNewClipError(output.message);
         }
     }
     removeClip(clipId, storage, options) {
-        return this.get(`${BASE_PATH}/clip_remove.cgi`, { clip_name: clipId, storage }, options);
+        return this._getJson(`${BASE_PATH}/clip_remove.cgi`, { clip_name: clipId, storage }, options);
     }
     async getClipList(options) {
-        const data = await this.get(`${BASE_PATH}/clip_list.cgi`, undefined, options);
-        return CamSwitcherAPI_1.clipListSchema.parse(data).clip_list;
+        const res = await this._getJson(`${BASE_PATH}/clip_list.cgi`, undefined, options);
+        return CamSwitcherAPI_1.clipListSchema.parse(res.data).clip_list;
     }
     setCamSwitchOptions(data, cameraFWVersion, options) {
         const bitrateVapixParams = parseBitrateOptionsToBitrateVapixParams(cameraFWVersion, data.bitrateMode, data);
@@ -230,7 +237,7 @@ class CamSwitcherAPI {
             settings.source = res.clip_name;
             settings.storage = res.storage;
         }
-        return settings;
+        return CamSwitcherAPI_1.globalAudioSettingsSchema.parse(settings);
     }
     async getSecondaryAudioSettings(options) {
         const res = await this.getParamFromCameraAndJSONParse(CSW_PARAM_NAMES.SECONDARY_AUDIO, options);
@@ -242,30 +249,28 @@ class CamSwitcherAPI {
             secondaryAudioLevel: res.secondary_audio_level ?? 1,
             masterAudioLevel: res.master_audio_level ?? 1,
         };
-        return settings;
+        return CamSwitcherAPI_1.secondaryAudioSettingsSchema.parse(settings);
     }
     async getPermanentRtspUrlToken(options) {
         const paramName = CSW_PARAM_NAMES.RTSP_TOKEN;
         const res = await this.vapixAgent.getParameter([paramName], options);
-        return res[paramName] ?? '';
+        return zod_1.z.string().parse(res[paramName] ?? '');
     }
-    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) {
-            const d = await res.json();
-            return d.data;
+            return await res.json();
         }
         else {
             throw new Error(await (0, utils_1.responseStringify)(res));
         }
     }
-    async set(path, data, parameters, options) {
+    async _post(path, data, parameters, options, headers) {
         const agent = this.getClient(options?.proxyParams);
-        const res = await agent.post({ path, data: JSON.stringify(data), parameters, timeout: options?.timeout });
+        const res = await agent.post({ path, data, parameters, timeout: options?.timeout, headers });
         if (res.ok) {
-            const parsed = await res.json();
-            return parsed.message === 'OK';
+            return await res.json();
         }
         else {
             throw new Error(await (0, utils_1.responseStringify)(res));
@@ -306,7 +311,7 @@ const parseBitrateOptionsToBitrateVapixParams = (firmWareVersion, bitrateMode, c
     if (!(0, versionCompare_1.isFirmwareVersionAtLeast)(firmWareVersion, constants_1.FIRMWARE_WITH_BITRATE_MODES_SUPPORT)) {
         return `videomaxbitrate=${cameraOptions.maximumBitRate}`;
     }
-    if (bitrateMode === null) {
+    if (bitrateMode === undefined) {
         return '';
     }
     const data = {

package/cjs/PlaneTrackerAPI.js

@@ -3,8 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PlaneTrackerAPI = void 0;
 const zod_1 = require("zod");
 const utils_1 = require("./internal/utils");
+const PlaneTrackerAPI_1 = require("./types/PlaneTrackerAPI");
 const errors_1 = require("./errors/errors");
 const ProxyClient_1 = require("./internal/ProxyClient");
+const GenetecAgent_1 = require("./types/GenetecAgent");
 const BASE_PATH = '/local/planetracker';
 class PlaneTrackerAPI {
     client;
@@ -13,13 +15,13 @@ class PlaneTrackerAPI {
         this.client = client;
         this.apiUser = apiUser;
     }
-    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 response = await this._getJson(`${BASE_PATH}/camera_time.cgi`, undefined, 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 resetPtzCalibration(options) {
         const agent = this.getClient(options?.proxyParams);
@@ -50,7 +52,8 @@ class PlaneTrackerAPI {
         });
     }
     async fetchCameraSettings(options) {
-        return await this._getJson(`${BASE_PATH}/package_camera_settings.cgi`, { action: 'get' }, options);
+        const res = await this._getJson(`${BASE_PATH}/package_camera_settings.cgi`, { action: 'get' }, options);
+        return PlaneTrackerAPI_1.cameraSettingsSchema.parse(res);
     }
     async setCameraSettings(settingsJsonString, options) {
         return await this._postJsonEncoded(`${BASE_PATH}/package_camera_settings.cgi`, settingsJsonString, {
@@ -58,7 +61,8 @@ class PlaneTrackerAPI {
         }, options);
     }
     async fetchServerSettings(options) {
-        return await this._getJson(`${BASE_PATH}/package_server_settings.cgi`, { action: 'get' }, options);
+        const res = await this._getJson(`${BASE_PATH}/package_server_settings.cgi`, { action: 'get' }, options);
+        return PlaneTrackerAPI_1.serverSettingsSchema.parse(res);
     }
     async exportAppSettings(dataType, options) {
         return await this._getBlob(`${BASE_PATH}/package_data.cgi`, { action: 'EXPORT', dataType }, options);
@@ -73,13 +77,15 @@ class PlaneTrackerAPI {
         });
     }
     async fetchFlightInfo(icao, options) {
-        return await this._getJson(`${BASE_PATH}/package/flightInfo.cgi`, { icao: encodeURIComponent(icao) }, options);
+        const res = await this._getJson(`${BASE_PATH}/package/flightInfo.cgi`, { icao }, options);
+        return PlaneTrackerAPI_1.flightInfoSchema.parse(res);
     }
     async getTrackingMode(options) {
-        return await this._getJson(`${BASE_PATH}/package/getTrackingMode.cgi`, undefined, options);
+        const res = await this._getJson(`${BASE_PATH}/package/getTrackingMode.cgi`, undefined, options);
+        return PlaneTrackerAPI_1.trackingModeSchema.parse(res);
     }
-    async setTrackingMode(modeJsonString, options) {
-        return await this._postJsonEncoded(`${BASE_PATH}/package/setTrackingMode.cgi`, modeJsonString, this.apiUser, options);
+    async setTrackingMode(mode, options) {
+        return await this._postJsonEncoded(`${BASE_PATH}/package/setTrackingMode.cgi`, { mode }, this.apiUser, options);
     }
     async startTrackingPlane(icao, options) {
         const agent = this.getClient(options?.proxyParams);
@@ -98,31 +104,36 @@ class PlaneTrackerAPI {
         });
     }
     async getPriorityList(options) {
-        return await this._getJson(`${BASE_PATH}/package/getPriorityList.cgi`, undefined, options);
+        const res = await this._getJson(`${BASE_PATH}/package/getPriorityList.cgi`, undefined, options);
+        return PlaneTrackerAPI_1.priorityListSchema.parse(res);
     }
-    async setPriorityList(priorityListJsonString, options) {
-        return await this._postJsonEncoded(`${BASE_PATH}/package/setPriorityList.cgi`, priorityListJsonString, this.apiUser, options);
+    async setPriorityList(priorityList, options) {
+        return await this._postJsonEncoded(`${BASE_PATH}/package/setPriorityList.cgi`, { priorityList }, this.apiUser, options);
     }
     async getWhiteList(options) {
-        return await this._getJson(`${BASE_PATH}/package/getWhiteList.cgi`, undefined, options);
+        const res = await this._getJson(`${BASE_PATH}/package/getWhiteList.cgi`, undefined, options);
+        return PlaneTrackerAPI_1.whiteListSchema.parse(res);
     }
-    async setWhiteList(whiteListJsonString, options) {
-        return await this._postJsonEncoded(`${BASE_PATH}/package/setWhiteList.cgi`, whiteListJsonString, this.apiUser, options);
+    async setWhiteList(whiteList, options) {
+        return await this._postJsonEncoded(`${BASE_PATH}/package/setWhiteList.cgi`, { whiteList }, this.apiUser, options);
     }
     async getBlackList(options) {
-        return await this._getJson(`${BASE_PATH}/package/getBlackList.cgi`, undefined, options);
+        const res = await this._getJson(`${BASE_PATH}/package/getBlackList.cgi`, undefined, options);
+        return PlaneTrackerAPI_1.blackListSchema.parse(res);
     }
-    async setBlackList(blackListJsonString, options) {
-        return await this._postJsonEncoded(`${BASE_PATH}/package/setBlackList.cgi`, blackListJsonString, this.apiUser, options);
+    async setBlackList(blackList, options) {
+        return await this._postJsonEncoded(`${BASE_PATH}/package/setBlackList.cgi`, { blackList }, this.apiUser, options);
     }
     async fetchMapInfo(options) {
-        return await this._getJson(`${BASE_PATH}/package/getMapInfo.cgi`, undefined, options);
+        const res = await this._getJson(`${BASE_PATH}/package/getMapInfo.cgi`, undefined, options);
+        return PlaneTrackerAPI_1.mapInfoSchema.parse(res);
     }
     async getZones(options) {
-        return await this._getJson(`${BASE_PATH}/package/getZones.cgi`, undefined, options);
+        const res = await this._getJson(`${BASE_PATH}/package/getZones.cgi`, undefined, options);
+        return PlaneTrackerAPI_1.zonesSchema.parse(res);
     }
-    async setZones(zonesJsonString, options) {
-        return await this._postJsonEncoded(`${BASE_PATH}/package/setZones.cgi`, zonesJsonString, this.apiUser, options);
+    async setZones(zones, options) {
+        return await this._postJsonEncoded(`${BASE_PATH}/package/setZones.cgi`, { zones }, this.apiUser, options);
     }
     async goToCoordinates(lat, lon, alt, options) {
         const agent = this.getClient(options?.proxyParams);
@@ -133,19 +144,25 @@ class PlaneTrackerAPI {
         });
     }
     async checkGenetecConnection(params, options) {
-        return await this._postUrlEncoded(`${BASE_PATH}/package/checkGenetecConnection.cgi`, params, options);
+        return await this._postUrlEncoded(`${BASE_PATH}/package/checkGenetecConnection.cgi`, '', params, options);
     }
     async getGenetecCameraList(params, options) {
-        const res = await this._postUrlEncoded(`${BASE_PATH}/package/getGenetecCameraList.cgi`, params, options);
-        return await res.json();
+        const res = await this._postUrlEncoded(`${BASE_PATH}/package/getGenetecCameraList.cgi`, '', params, options);
+        return GenetecAgent_1.cameraListSchema.parse(res);
     }
-    async _getJson(path, parameters, options) {
+    async _getJson(path, parameters, options, headers) {
         const agent = this.getClient(options?.proxyParams);
-        const res = await agent.get({
-            path,
-            parameters,
-            timeout: options?.timeout,
-        });
+        const res = await agent.get({ path, parameters, timeout: options?.timeout, headers });
+        if (res.ok) {
+            return await res.json();
+        }
+        else {
+            throw new Error(await (0, utils_1.responseStringify)(res));
+        }
+    }
+    async _post(path, data, parameters, options, headers) {
+        const agent = this.getClient(options?.proxyParams);
+        const res = await agent.post({ path, data, parameters, headers, timeout: options?.timeout });
         if (res.ok) {
             return await res.json();
         }
@@ -155,11 +172,7 @@ class PlaneTrackerAPI {
     }
     async _getBlob(path, parameters, options) {
         const agent = this.getClient(options?.proxyParams);
-        const res = await agent.get({
-            path,
-            parameters,
-            timeout: options?.timeout,
-        });
+        const res = await agent.get({ path, parameters, timeout: options?.timeout });
         if (res.ok) {
             return await this.parseBlobResponse(res);
         }
@@ -175,37 +188,13 @@ class PlaneTrackerAPI {
             throw new errors_1.ParsingBlobError(err);
         }
     }
-    async _postJsonEncoded(path, data, parameters, options) {
-        const agent = this.getClient(options?.proxyParams);
-        const res = await agent.post({
-            path,
-            data,
-            parameters,
-            headers: { 'Accept': 'application/json', 'Content-Type': 'application/json' },
-            timeout: options?.timeout,
-        });
-        if (res.ok) {
-            return res;
-        }
-        else {
-            throw new Error(await (0, utils_1.responseStringify)(res));
-        }
+    async _postUrlEncoded(path, data, parameters, options, headers) {
+        const baseHeaders = { 'Content-Type': 'application/x-www-form-urlencoded' };
+        return this._post(path, data, parameters, options, { ...baseHeaders, ...headers });
     }
-    async _postUrlEncoded(path, params, options) {
-        const data = (0, utils_1.paramToUrl)(params);
-        const agent = this.getClient(options?.proxyParams);
-        const res = await agent.post({
-            path,
-            data,
-            headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-            timeout: options?.timeout,
-        });
-        if (res.ok) {
-            return res;
-        }
-        else {
-            throw new Error(await (0, utils_1.responseStringify)(res));
-        }
+    async _postJsonEncoded(path, data, parameters, options, headers) {
+        const baseHeaders = { 'Accept': 'application/json', 'Content-Type': 'application/json' };
+        return this._post(path, data, parameters, options, { ...baseHeaders, ...headers });
     }
 }
 exports.PlaneTrackerAPI = PlaneTrackerAPI;

package/cjs/VapixAPI.js

@@ -110,11 +110,11 @@ class VapixAPI {
         });
         const result = parser.parse(xmlText);
         const data = result.root.disks.disk;
-        return {
+        return VapixAPI_1.sdCardInfoSchema.parse({
             totalSize: parseInt(data.totalsize),
             freeSize: parseInt(data.freesize),
             status: VapixAPI_1.sdCardWatchedStatuses.includes(data.status) ? data.status : 'disconnected',
-        };
+        });
     }
     mountSDCard(options) {
         return this._doSDCardMountAction('MOUNT', options);
@@ -183,7 +183,7 @@ class VapixAPI {
         if ((0, utils_1.isNullish)(captureMode.maxFPS)) {
             throw new errors_1.MaxFPSError('FPS_NOT_SPECIFIED');
         }
-        return captureMode.maxFPS;
+        return zod_1.z.number().parse(captureMode.maxFPS);
     }
     async getTimezone(options) {
         try {
@@ -207,7 +207,7 @@ class VapixAPI {
         if (data.data.timeZone === undefined) {
             throw new Error('Time zone not setup on the device');
         }
-        return data.data.timeZone;
+        return zod_1.z.string().parse(data.data.timeZone);
     }
     async getDateTimeInfo(options) {
         const data = { apiVersion: '1.0', method: 'getDateTimeInfo' };
@@ -262,7 +262,7 @@ class VapixAPI {
         const gTourList = new Array();
         const response = await this.getParameter('GuardTour', options);
         for (let i = 0; i < 20; i++) {
-            const gTourBaseName = 'root.GuardTour.G' + i;
+            const gTourBaseName = 'GuardTour.G' + i;
             if (gTourBaseName + '.CamNbr' in response) {
                 const gTour = {
                     id: gTourBaseName,
@@ -274,7 +274,7 @@ class VapixAPI {
                     tour: [],
                 };
                 for (let j = 0; j < 100; j++) {
-                    const tourBaseName = 'root.GuardTour.G' + i + '.Tour.T' + j;
+                    const tourBaseName = 'GuardTour.G' + i + '.Tour.T' + j;
                     if (tourBaseName + '.MoveSpeed' in response) {
                         const tour = {
                             moveSpeed: response[tourBaseName + '.MoveSpeed'],
@@ -292,17 +292,17 @@ class VapixAPI {
                 break;
             }
         }
-        return gTourList;
+        return VapixAPI_1.guardTourSchema.parse(gTourList);
     }
-    setGuardTourEnabled(guardTourID, enable, options) {
+    setGuardTourEnabled(guardTourId, enable, options) {
         const params = {};
-        params[guardTourID + '.Running'] = enable ? 'yes' : 'no';
+        params[guardTourId + '.Running'] = enable ? 'yes' : 'no';
         return this.setParameter(params, options);
     }
     async getPTZPresetList(channel, options) {
         const res = await this.postUrlEncoded('/axis-cgi/com/ptz.cgi', {
             query: 'presetposcam',
-            camera: channel.toString(),
+            camera: channel,
         }, undefined, options);
         const text = await res.text();
         const lines = text.split(/[\r\n]/);
@@ -316,7 +316,7 @@ class VapixAPI {
                 }
             }
         }
-        return positions;
+        return zod_1.z.array(zod_1.z.string()).parse(positions);
     }
     async listPTZ(camera, options) {
         const url = `/axis-cgi/com/ptz.cgi`;
@@ -350,7 +350,7 @@ class VapixAPI {
                 res[camera - 1] = item.map(({ data: itemData, ...d }) => d);
             }
         });
-        return res;
+        return VapixAPI_1.ptzOverviewSchema.parse(res);
     }
     goToPreset(channel, presetName, options) {
         return this.postUrlEncoded('/axis-cgi/com/ptz.cgi', {
@@ -364,11 +364,11 @@ class VapixAPI {
             camera: camera.toString(),
         }, undefined, options);
         const params = VapixAPI.parseParameters(await res.text());
-        return {
+        return VapixAPI_1.cameraPTZItemDataSchema.parse({
             pan: Number(params.pan),
             tilt: Number(params.tilt),
             zoom: Number(params.zoom),
-        };
+        });
     }
     async getPorts(options) {
         const res = await this.postJson('/axis-cgi/io/portmanagement.cgi', {
@@ -376,7 +376,7 @@ class VapixAPI {
             context: '',
             method: 'getPorts',
         }, undefined, options);
-        const portResponseParsed = await VapixAPI_1.getPortsResponseSchema.parse(res.json());
+        const portResponseParsed = VapixAPI_1.getPortsResponseSchema.parse(await res.json());
         return portResponseParsed.data.items;
     }
     async setPorts(ports, options) {
@@ -409,19 +409,20 @@ class VapixAPI {
         if (!Array.isArray(apps)) {
             apps = [apps];
         }
-        return apps.map((app) => {
+        const appList = apps.map((app) => {
             return {
                 ...app,
                 appId: VapixAPI_1.APP_IDS.find((id) => id.toLowerCase() === app.Name.toLowerCase()) ?? null,
             };
         });
+        return VapixAPI_1.applicationListSchema.parse(appList);
     }
-    async startApplication(applicationID, options) {
+    async startApplication(applicationId, options) {
         const agent = this.getClient(options?.proxyParams);
         const res = await agent.get({
             path: '/axis-cgi/applications/control.cgi',
             parameters: {
-                package: applicationID.toLowerCase(),
+                package: applicationId.toLowerCase(),
                 action: 'start',
             },
             timeout: options?.timeout,
@@ -431,12 +432,12 @@ class VapixAPI {
             throw new errors_1.ApplicationAPIError('START', await (0, utils_1.responseStringify)(res));
         }
     }
-    async restartApplication(applicationID, options) {
+    async restartApplication(applicationId, options) {
         const agent = this.getClient(options?.proxyParams);
         const res = await agent.get({
             path: '/axis-cgi/applications/control.cgi',
             parameters: {
-                package: applicationID.toLowerCase(),
+                package: applicationId.toLowerCase(),
                 action: 'restart',
             },
             timeout: options?.timeout,
@@ -446,12 +447,12 @@ class VapixAPI {
             throw new errors_1.ApplicationAPIError('RESTART', await (0, utils_1.responseStringify)(res));
         }
     }
-    async stopApplication(applicationID, options) {
+    async stopApplication(applicationId, options) {
         const agent = this.getClient(options?.proxyParams);
         const res = await agent.get({
             path: '/axis-cgi/applications/control.cgi',
             parameters: {
-                package: applicationID.toLowerCase(),
+                package: applicationId.toLowerCase(),
                 action: 'stop',
             },
             timeout: options?.timeout,

package/cjs/{CamOverlayDrawingAPI.js → node/CamOverlayDrawingAPI.js}

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CamOverlayDrawingAPI = void 0;
 const events_1 = __importDefault(require("events"));
-const WsClient_1 = require("./node/WsClient");
+const WsClient_1 = require("./WsClient");
 class CamOverlayDrawingAPI extends events_1.default {
     tls;
     tlsInsecure;

package/cjs/{CamOverlayPainter → node/CamOverlayPainter}/Painter.js

@@ -1,20 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Painter = exports.COORD = void 0;
+exports.Painter = void 0;
 const CamOverlayDrawingAPI_1 = require("../CamOverlayDrawingAPI");
 const ResourceManager_1 = require("./ResourceManager");
 const Frame_1 = require("./Frame");
-exports.COORD = {
-    top_left: [-1, -1],
-    center_left: [-1, 0],
-    bottom_left: [-1, 1],
-    top_center: [0, -1],
-    center: [0, 0],
-    bottom_center: [0, 1],
-    top_right: [1, -1],
-    center_right: [1, 0],
-    bottom_right: [1, 1],
-};
+const CamOverlayPainter_1 = require("../../types/CamOverlayPainter");
 class Painter extends Frame_1.Frame {
     screenWidth;
     screenHeight;
@@ -25,7 +15,7 @@ class Painter extends Frame_1.Frame {
     layers = [];
     constructor(opt, coopt) {
         super(opt);
-        this.coAlignment = exports.COORD[opt.coAlignment];
+        this.coAlignment = CamOverlayPainter_1.COORD[opt.coAlignment];
         this.screenWidth = opt.screenWidth;
         this.screenHeight = opt.screenHeight;
         this.cod = new CamOverlayDrawingAPI_1.CamOverlayDrawingAPI(coopt);
@@ -69,7 +59,7 @@ class Painter extends Frame_1.Frame {
         this.screenHeight = sh;
     }
     setCoAlignment(coAlignment) {
-        this.coAlignment = exports.COORD[coAlignment];
+        this.coAlignment = CamOverlayPainter_1.COORD[coAlignment];
     }
     layoutChanged() {
         this.refreshLayers = true;

package/cjs/{CamScripterAPICameraEventsGenerator.js → node/CamScripterAPICameraEventsGenerator.js}

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CamScripterAPICameraEventsGenerator = void 0;
 const events_1 = __importDefault(require("events"));
-const WsClient_1 = require("./node/WsClient");
+const WsClient_1 = require("./WsClient");
 class CamScripterAPICameraEventsGenerator extends events_1.default {
     tls;
     tlsInsecure;

package/cjs/{VapixEvents.js → node/VapixEvents.js}

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VapixEvents = void 0;
 const eventemitter2_1 = require("eventemitter2");
-const WsClient_1 = require("./node/WsClient");
+const WsClient_1 = require("./WsClient");
 class VapixEvents extends eventemitter2_1.EventEmitter2 {
     tls;
     tlsInsecure;