camstreamerlib 4.0.0-beta.102 → 4.0.0-beta.103

package/cjs/CamStreamerAPI.js

@@ -32,6 +32,9 @@ class CamStreamerAPI {
         }
         return zod_1.z.number().parse(res.data);
     }
+    async getMaxFps(source = 0, options) {
+        return await this._getJson(`${BASE_PATH}/get_max_framerate.cgi`, { video_source: source.toString() }, options);
+    }
     async getStreamList(options) {
         const res = await this._getJson(`${BASE_PATH}/stream_list.cgi`, { action: 'get' }, options);
         const oldStreamListRecord = zod_1.z.record(zod_1.z.string(), oldStreamSchema_1.oldStringStreamSchema).safeParse(res.data);
@@ -44,6 +47,7 @@ class CamStreamerAPI {
         }
         const newStreamData = [];
         const oldStreamData = [];
+        const invalidStreamData = [];
         for (const streamData of res.data.streamList) {
             const newStreamParse = CamStreamerAPI_1.streamSchema.safeParse(streamData);
             if (newStreamParse.success) {
@@ -58,10 +62,10 @@ class CamStreamerAPI {
                 });
                 continue;
             }
-            throw new Error('Failed to parse some stream entries');
+            invalidStreamData.push(streamData);
         }
         if (oldStreamData.length > 0) {
-            throw new errors_1.MigrationError(newStreamData, oldStreamData);
+            throw new errors_1.MigrationError(newStreamData, oldStreamData, invalidStreamData);
         }
         return newStreamData;
     }
@@ -89,6 +93,12 @@ class CamStreamerAPI {
         const res = await this._getJson(`${BASE_PATH}/get_streamstat.cgi`, { stream_id: streamId }, options);
         return res.data.is_streaming === 1;
     }
+    async setStreamEnabled(streamId, enabled, options) {
+        await this._postUrlEncoded(`${BASE_PATH}/set_stream_enabled.cgi`, { stream_id: streamId, enabled: enabled ? 1 : 0 }, options);
+    }
+    async setStreamActive(streamId, active, options) {
+        await this._postUrlEncoded(`${BASE_PATH}/set_stream_active.cgi`, { stream_id: streamId, active: active ? 1 : 0 }, options);
+    }
     async listFiles(options) {
         const res = await this._getJson(`${BASE_PATH}/upload_audio.cgi`, { action: 'list' }, options);
         return CamStreamerAPI_1.audioFileListSchema.parse(res.data);

package/cjs/CamSwitcherAPI.js

@@ -3,12 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CamSwitcherAPI = void 0;
 const zod_1 = require("zod");
 const errors_1 = require("./errors/errors");
+const convertors_1 = require("./internal/convertors");
 const utils_1 = require("./internal/utils");
 const CamSwitcherAPI_1 = require("./types/CamSwitcherAPI");
 const common_1 = require("./types/common");
 const VapixAPI_1 = require("./VapixAPI");
-const versionCompare_1 = require("./internal/versionCompare");
-const constants_1 = require("./internal/constants");
 const ProxyClient_1 = require("./internal/ProxyClient");
 const BASE_PATH = '/local/camswitcher/api';
 class CamSwitcherAPI {
@@ -139,7 +138,13 @@ class CamSwitcherAPI {
         return CamSwitcherAPI_1.clipListSchema.parse(res.data).clip_list;
     }
     setCamSwitchOptions(data, cameraFWVersion, options) {
-        const bitrateVapixParams = parseBitrateOptionsToBitrateVapixParams(cameraFWVersion, data.bitrateMode, data);
+        const bitrateData = {
+            bitrateMode: data.bitrateMode,
+            maximumBitRate: data.maximumBitRate,
+            retentionTime: data.retentionTime,
+            bitRateLimit: data.bitRateLimit,
+        };
+        const bitrateVapixParams = (0, convertors_1.parseBitrateOptionsToVapixParams)(cameraFWVersion, data.bitrateMode, bitrateData);
         const saveData = {
             video: {
                 resolution: data.resolution,
@@ -202,7 +207,7 @@ class CamSwitcherAPI {
             return saveData;
         }
         if (!(0, utils_1.isNullish)(saveData.video?.bitrateVapixParams)) {
-            const bitrateOptions = parseVapixParamsToBitrateOptions(saveData.video.bitrateVapixParams);
+            const bitrateOptions = (0, convertors_1.parseVapixParamsToBitrateOptions)(saveData.video.bitrateVapixParams);
             saveData.video.bitrateMode = bitrateOptions.bitrateMode;
             saveData.video.maximumBitRate = bitrateOptions.maximumBitRate;
             saveData.video.retentionTime = bitrateOptions.retentionTime;
@@ -307,62 +312,3 @@ const CSW_PARAM_NAMES = {
     RTSP_TOKEN: 'Camswitcher.RTSPAccessToken',
     DEFAULT_PLAYLIST: 'Camswitcher.DefaultPlaylist',
 };
-const parseBitrateOptionsToBitrateVapixParams = (firmWareVersion, bitrateMode, cameraOptions) => {
-    if (!(0, versionCompare_1.isFirmwareVersionAtLeast)(firmWareVersion, constants_1.FIRMWARE_WITH_BITRATE_MODES_SUPPORT)) {
-        return `videomaxbitrate=${cameraOptions.maximumBitRate}`;
-    }
-    if (bitrateMode === undefined) {
-        return '';
-    }
-    const data = {
-        VBR: 'videobitratemode=vbr',
-        MBR: `videobitratemode=mbr&videomaxbitrate=${cameraOptions.maximumBitRate}`,
-        ABR: `videobitratemode=abr&videoabrtargetbitrate=${cameraOptions.maximumBitRate}&videoabrretentiontime=${cameraOptions.retentionTime}&videoabrmaxbitrate=${cameraOptions.bitRateLimit}`,
-    };
-    return data[bitrateMode];
-};
-const parseVapixParamsToBitrateOptions = (bitrateVapixParams) => {
-    const params = {};
-    const searchParams = new URLSearchParams(bitrateVapixParams);
-    searchParams.forEach((value, key) => {
-        params[key] = value;
-    });
-    const bitrateMode = params['videobitratemode'] !== undefined ? params['videobitratemode'].toUpperCase() : undefined;
-    const hasLowerFw = bitrateMode === undefined && params['videomaxbitrate'] !== undefined;
-    if (hasLowerFw) {
-        const maximumBitRate = parseInt(params['videomaxbitrate'] ?? '0', 10);
-        return {
-            bitrateMode: 'MBR',
-            maximumBitRate: maximumBitRate,
-            retentionTime: 1,
-            bitRateLimit: Math.floor(maximumBitRate * 1.1),
-        };
-    }
-    if (bitrateMode === 'ABR') {
-        const maximumBitRate = parseInt(params['videoabrtargetbitrate'] ?? '0', 10);
-        const retentionTime = parseInt(params['videoabrretentiontime'] ?? '0', 10);
-        const bitRateLimit = parseInt(params['videoabrmaxbitrate'] ?? '0', 10);
-        return {
-            bitrateMode,
-            maximumBitRate,
-            retentionTime,
-            bitRateLimit,
-        };
-    }
-    else if (bitrateMode === 'MBR') {
-        const maximumBitRate = params['videomaxbitrate'] !== undefined ? parseInt(params['videomaxbitrate'], 10) : null;
-        const oldMaximumBitrateParamValue = parseInt(params['videombrmaxbitrate'] ?? '0', 10);
-        return {
-            bitrateMode: bitrateMode,
-            maximumBitRate: maximumBitRate ?? oldMaximumBitrateParamValue,
-            retentionTime: 1,
-            bitRateLimit: Math.floor(maximumBitRate ?? oldMaximumBitrateParamValue * 1.1),
-        };
-    }
-    return {
-        bitrateMode: bitrateMode,
-        retentionTime: 1,
-        maximumBitRate: 0,
-        bitRateLimit: 0,
-    };
-};

package/cjs/errors/errors.d.ts

@@ -92,11 +92,12 @@ export declare class BadRequestError<T extends TResponse> extends ErrorWithRespo
 }
 export declare class MigrationError extends Error {
     readonly valid: TStream[];
-    readonly invalid: (TOldStream & {
+    readonly old: (TOldStream & {
         id: number;
     })[];
-    constructor(valid: TStream[], invalid: (TOldStream & {
+    readonly invalid: any[];
+    constructor(valid: TStream[], old: (TOldStream & {
         id: number;
-    })[]);
+    })[], invalid?: any[]);
 }
 export {};

package/cjs/errors/errors.js

@@ -206,11 +206,13 @@ class BadRequestError extends ErrorWithResponse {
 exports.BadRequestError = BadRequestError;
 class MigrationError extends Error {
     valid;
+    old;
     invalid;
-    constructor(valid, invalid) {
+    constructor(valid, old, invalid = []) {
         super('Migration to newer version is needed: some stream entries failed to parse.');
         this.name = 'MigrationError';
         this.valid = valid;
+        this.old = old;
         this.invalid = invalid;
     }
 }

package/cjs/index.d.ts

@@ -1,6 +1,7 @@
 export * from './errors/errors';
 export * from './internal/types';
 export * from './internal/constants';
+export * from './internal/convertors';
 export * from './internal/utils';
 export * from './internal/versionCompare';
 export * from './internal/ProxyClient';

package/cjs/index.js

@@ -18,6 +18,7 @@ exports.VapixAPI = exports.CamScripterAPI = exports.PlaneTrackerEvents = exports
 __exportStar(require("./errors/errors"), exports);
 __exportStar(require("./internal/types"), exports);
 __exportStar(require("./internal/constants"), exports);
+__exportStar(require("./internal/convertors"), exports);
 __exportStar(require("./internal/utils"), exports);
 __exportStar(require("./internal/versionCompare"), exports);
 __exportStar(require("./internal/ProxyClient"), exports);

package/cjs/internal/constants.d.ts

@@ -1 +1,2 @@
 export declare const FIRMWARE_WITH_BITRATE_MODES_SUPPORT = "11.11.73";
+export declare const FIRMWARE_WITH_OVERLAYS_SUPPORT = "10.7.0";

package/cjs/internal/constants.js

@@ -1,4 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FIRMWARE_WITH_BITRATE_MODES_SUPPORT = void 0;
+exports.FIRMWARE_WITH_OVERLAYS_SUPPORT = exports.FIRMWARE_WITH_BITRATE_MODES_SUPPORT = void 0;
 exports.FIRMWARE_WITH_BITRATE_MODES_SUPPORT = '11.11.73';
+exports.FIRMWARE_WITH_OVERLAYS_SUPPORT = '10.7.0';

package/cjs/internal/convertors.d.ts

@@ -0,0 +1,6 @@
+import { TInternalVapixParameters } from '../types/CamStreamerAPI';
+import { TBitrateMode, TBitrateVapixParams } from '../types/common';
+export declare const parseBitrateOptionsToVapixParams: (firmWareVersion: string, bitrateMode: TBitrateMode | undefined, cameraOptions: Partial<TBitrateVapixParams>) => string;
+export declare const parseVapixParamsToBitrateOptions: (bitrateVapixParams: string) => TBitrateVapixParams;
+export declare const parseVideoOptionsToVapixParams: (firmWareVersion: string, video: TInternalVapixParameters) => string;
+export declare const parseVapixParamsToVideoOptions: (internalVapixParams: string) => TInternalVapixParameters;

package/cjs/internal/convertors.js

@@ -0,0 +1,115 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseVapixParamsToVideoOptions = exports.parseVideoOptionsToVapixParams = exports.parseVapixParamsToBitrateOptions = exports.parseBitrateOptionsToVapixParams = void 0;
+const constants_1 = require("./constants");
+const versionCompare_1 = require("./versionCompare");
+const parseBitrateOptionsToVapixParams = (firmWareVersion, bitrateMode, cameraOptions) => {
+    if (!(0, versionCompare_1.isFirmwareVersionAtLeast)(firmWareVersion, constants_1.FIRMWARE_WITH_BITRATE_MODES_SUPPORT)) {
+        return `videomaxbitrate=${cameraOptions.maximumBitRate}`;
+    }
+    if (bitrateMode === undefined) {
+        return '';
+    }
+    const data = {
+        VBR: 'videobitratemode=vbr',
+        MBR: `videobitratemode=mbr&videomaxbitrate=${cameraOptions.maximumBitRate}&videobitratepriority=framerate`,
+        ABR: `videobitratemode=abr&videoabrtargetbitrate=${cameraOptions.maximumBitRate}&videoabrretentiontime=${cameraOptions.retentionTime}&videoabrmaxbitrate=${cameraOptions.bitRateLimit}`,
+    };
+    return data[bitrateMode];
+};
+exports.parseBitrateOptionsToVapixParams = parseBitrateOptionsToVapixParams;
+const parseVapixParamsToBitrateOptions = (bitrateVapixParams) => {
+    const params = {};
+    const searchParams = new URLSearchParams(bitrateVapixParams);
+    searchParams.forEach((value, key) => {
+        params[key] = value;
+    });
+    const bitrateMode = params['videobitratemode'] !== undefined ? params['videobitratemode'].toUpperCase() : undefined;
+    const hasLowerFw = bitrateMode === undefined && params['videomaxbitrate'] !== undefined;
+    if (hasLowerFw) {
+        const maximumBitRate = parseInt(params['videomaxbitrate'] ?? '0', 10);
+        return {
+            bitrateMode: 'MBR',
+            maximumBitRate: maximumBitRate,
+            retentionTime: 1,
+            bitRateLimit: Math.floor(maximumBitRate * 1.1),
+        };
+    }
+    if (bitrateMode === 'ABR') {
+        const maximumBitRate = parseInt(params['videoabrtargetbitrate'] ?? '0', 10);
+        const retentionTime = parseInt(params['videoabrretentiontime'] ?? '0', 10);
+        const bitRateLimit = parseInt(params['videoabrmaxbitrate'] ?? '0', 10);
+        return {
+            bitrateMode,
+            maximumBitRate,
+            retentionTime,
+            bitRateLimit,
+        };
+    }
+    else if (bitrateMode === 'MBR') {
+        const maximumBitRate = params['videomaxbitrate'] !== undefined ? parseInt(params['videomaxbitrate'], 10) : null;
+        const oldMaximumBitrateParamValue = parseInt(params['videombrmaxbitrate'] ?? '0', 10);
+        return {
+            bitrateMode: bitrateMode,
+            maximumBitRate: maximumBitRate ?? oldMaximumBitrateParamValue,
+            retentionTime: 1,
+            bitRateLimit: Math.floor(maximumBitRate ?? oldMaximumBitrateParamValue * 1.1),
+        };
+    }
+    return {
+        bitrateMode: bitrateMode,
+        retentionTime: 1,
+        maximumBitRate: 0,
+        bitRateLimit: 0,
+    };
+};
+exports.parseVapixParamsToBitrateOptions = parseVapixParamsToBitrateOptions;
+const parseVideoOptionsToVapixParams = (firmWareVersion, video) => {
+    const bitrateParams = (0, exports.parseBitrateOptionsToVapixParams)(firmWareVersion, video.bitrateMode, {
+        maximumBitRate: video.maximumBitRate,
+        retentionTime: video.retentionTime,
+        bitRateLimit: video.bitRateLimit,
+    });
+    let overlaysParams = '';
+    if ((0, versionCompare_1.isFirmwareVersionAtLeast)(firmWareVersion, constants_1.FIRMWARE_WITH_OVERLAYS_SUPPORT)) {
+        overlaysParams = `&overlays=${video.overlays}`;
+    }
+    const nbrOfChannels = video.audio === 1 ? `&nbrOfChannels=${video.nbrOfChannels}` : '';
+    const audioParams = `audio=${video.audio}${nbrOfChannels}`;
+    const videoCodecParams = video.videoCodec === 'h264'
+        ? `videoCodec=${video.videoCodec}&h264Profile=${video.h264Profile}`
+        : `videoCodec=${video.videoCodec}`;
+    const videoParams = `camera=${video.camera}&resolution=${video.resolution}&fps=${video.fps}&compression=${video.compression}&videokeyframeinterval=${video.govLength}&${videoCodecParams}${overlaysParams}`;
+    return [videoParams, bitrateParams, audioParams].join('&');
+};
+exports.parseVideoOptionsToVapixParams = parseVideoOptionsToVapixParams;
+const parseVapixParamsToVideoOptions = (internalVapixParams) => {
+    const bitrateOptions = (0, exports.parseVapixParamsToBitrateOptions)(internalVapixParams);
+    const params = {};
+    const searchParams = new URLSearchParams(internalVapixParams);
+    searchParams.forEach((value, key) => {
+        params[key] = value;
+    });
+    let h264Profile = undefined;
+    if (params['videoCodec'] === 'h264') {
+        h264Profile = (params['h264Profile'] ?? 'high');
+    }
+    let nbrOfChannels = undefined;
+    if (params['audio'] === '1') {
+        nbrOfChannels = parseInt(params['nbrOfChannels'] ?? '1');
+    }
+    return {
+        ...bitrateOptions,
+        camera: params['camera'] ?? '1',
+        resolution: params['resolution'] ?? '',
+        fps: parseInt(params['fps'] ?? '0', 10),
+        compression: parseInt(params['compression'] ?? '0', 10),
+        govLength: parseInt(params['videokeyframeinterval'] ?? '0', 10),
+        videoCodec: (params['videoCodec'] ?? 'h264'),
+        h264Profile,
+        audio: parseInt(params['audio'] ?? '0'),
+        nbrOfChannels,
+        overlays: params['overlays'],
+    };
+};
+exports.parseVapixParamsToVideoOptions = parseVapixParamsToVideoOptions;

package/cjs/types/CamOverlayAPI/CamOverlayAPI.d.ts

@@ -230,12 +230,13 @@ export declare const servicesSchema: z.ZodDiscriminatedUnion<"name", [z.ZodObjec
     generalAddress: z.ZodOptional<z.ZodString>;
     showDegrees: z.ZodDefault<z.ZodBoolean>;
 }, "strip", z.ZodTypeAny, {
-    type: "map" | "compass" | "image";
+    type: "map" | "image" | "compass";
     name: "ptzCompass";
     enabled: 0 | 1;
     id: number;
     width: number;
     height: number;
+    image: string;
     automationType: "manual" | "schedule" | "time" | `input${number}`;
     cameraList: number[];
     customName: string;
@@ -243,7 +244,6 @@ export declare const servicesSchema: z.ZodDiscriminatedUnion<"name", [z.ZodObjec
     pos_y: number;
     coordSystem: "top_left" | "top" | "top_right" | "left" | "center" | "right" | "bottom_left" | "bottom" | "bottom_right";
     scale: number;
-    image: string;
     northPan: number;
     cameraPosX: number;
     cameraPosY: number;
@@ -261,19 +261,19 @@ export declare const servicesSchema: z.ZodDiscriminatedUnion<"name", [z.ZodObjec
     generalIframeHeight?: number | undefined;
     generalAddress?: string | undefined;
 }, {
-    type: "map" | "compass" | "image";
+    type: "map" | "image" | "compass";
     name: "ptzCompass";
     enabled: 0 | 1;
     id: number;
     width: number;
     height: number;
+    image: string;
     automationType: "manual" | "schedule" | "time" | `input${number}`;
     cameraList: number[];
     pos_x: number;
     pos_y: number;
     coordSystem: "top_left" | "top" | "top_right" | "left" | "center" | "right" | "bottom_left" | "bottom" | "bottom_right";
     scale: number;
-    image: string;
     northPan: number;
     cameraPosX: number;
     cameraPosY: number;
@@ -874,13 +874,13 @@ export declare const servicesSchema: z.ZodDiscriminatedUnion<"name", [z.ZodObjec
     id: number;
     width: number;
     height: number;
+    image: string;
     automationType: "manual" | "schedule" | "time" | `input${number}`;
     cameraList: number[];
     customName: string;
     pos_x: number;
     pos_y: number;
     coordSystem: "top_left" | "top" | "top_right" | "left" | "center" | "right" | "bottom_left" | "bottom" | "bottom_right";
-    image: string;
     clockFormat: "12h" | "24h";
     background: "custom" | "image";
     customAreaColor: string;
@@ -954,12 +954,12 @@ export declare const servicesSchema: z.ZodDiscriminatedUnion<"name", [z.ZodObjec
     id: number;
     width: number;
     height: number;
+    image: string;
     automationType: "manual" | "schedule" | "time" | `input${number}`;
     cameraList: number[];
     pos_x: number;
     pos_y: number;
     coordSystem: "top_left" | "top" | "top_right" | "left" | "center" | "right" | "bottom_left" | "bottom" | "bottom_right";
-    image: string;
     clockFormat: "12h" | "24h";
     background: "custom" | "image";
     customAreaColor: string;
@@ -1703,12 +1703,13 @@ export declare const serviceListSchema: z.ZodObject<{
         generalAddress: z.ZodOptional<z.ZodString>;
         showDegrees: z.ZodDefault<z.ZodBoolean>;
     }, "strip", z.ZodTypeAny, {
-        type: "map" | "compass" | "image";
+        type: "map" | "image" | "compass";
         name: "ptzCompass";
         enabled: 0 | 1;
         id: number;
         width: number;
         height: number;
+        image: string;
         automationType: "manual" | "schedule" | "time" | `input${number}`;
         cameraList: number[];
         customName: string;
@@ -1716,7 +1717,6 @@ export declare const serviceListSchema: z.ZodObject<{
         pos_y: number;
         coordSystem: "top_left" | "top" | "top_right" | "left" | "center" | "right" | "bottom_left" | "bottom" | "bottom_right";
         scale: number;
-        image: string;
         northPan: number;
         cameraPosX: number;
         cameraPosY: number;
@@ -1734,19 +1734,19 @@ export declare const serviceListSchema: z.ZodObject<{
         generalIframeHeight?: number | undefined;
         generalAddress?: string | undefined;
     }, {
-        type: "map" | "compass" | "image";
+        type: "map" | "image" | "compass";
         name: "ptzCompass";
         enabled: 0 | 1;
         id: number;
         width: number;
         height: number;
+        image: string;
         automationType: "manual" | "schedule" | "time" | `input${number}`;
         cameraList: number[];
         pos_x: number;
         pos_y: number;
         coordSystem: "top_left" | "top" | "top_right" | "left" | "center" | "right" | "bottom_left" | "bottom" | "bottom_right";
         scale: number;
-        image: string;
         northPan: number;
         cameraPosX: number;
         cameraPosY: number;
@@ -2347,13 +2347,13 @@ export declare const serviceListSchema: z.ZodObject<{
         id: number;
         width: number;
         height: number;
+        image: string;
         automationType: "manual" | "schedule" | "time" | `input${number}`;
         cameraList: number[];
         customName: string;
         pos_x: number;
         pos_y: number;
         coordSystem: "top_left" | "top" | "top_right" | "left" | "center" | "right" | "bottom_left" | "bottom" | "bottom_right";
-        image: string;
         clockFormat: "12h" | "24h";
         background: "custom" | "image";
         customAreaColor: string;
@@ -2427,12 +2427,12 @@ export declare const serviceListSchema: z.ZodObject<{
         id: number;
         width: number;
         height: number;
+        image: string;
         automationType: "manual" | "schedule" | "time" | `input${number}`;
         cameraList: number[];
         pos_x: number;
         pos_y: number;
         coordSystem: "top_left" | "top" | "top_right" | "left" | "center" | "right" | "bottom_left" | "bottom" | "bottom_right";
-        image: string;
         clockFormat: "12h" | "24h";
         background: "custom" | "image";
         customAreaColor: string;
@@ -3025,12 +3025,13 @@ export declare const serviceListSchema: z.ZodObject<{
         invertInput?: boolean | undefined;
         zIndex?: number | undefined;
     } | {
-        type: "map" | "compass" | "image";
+        type: "map" | "image" | "compass";
         name: "ptzCompass";
         enabled: 0 | 1;
         id: number;
         width: number;
         height: number;
+        image: string;
         automationType: "manual" | "schedule" | "time" | `input${number}`;
         cameraList: number[];
         customName: string;
@@ -3038,7 +3039,6 @@ export declare const serviceListSchema: z.ZodObject<{
         pos_y: number;
         coordSystem: "top_left" | "top" | "top_right" | "left" | "center" | "right" | "bottom_left" | "bottom" | "bottom_right";
         scale: number;
-        image: string;
         northPan: number;
         cameraPosX: number;
         cameraPosY: number;
@@ -3148,13 +3148,13 @@ export declare const serviceListSchema: z.ZodObject<{
         id: number;
         width: number;
         height: number;
+        image: string;
         automationType: "manual" | "schedule" | "time" | `input${number}`;
         cameraList: number[];
         customName: string;
         pos_x: number;
         pos_y: number;
         coordSystem: "top_left" | "top" | "top_right" | "left" | "center" | "right" | "bottom_left" | "bottom" | "bottom_right";
-        image: string;
         clockFormat: "12h" | "24h";
         background: "custom" | "image";
         customAreaColor: string;
@@ -3436,19 +3436,19 @@ export declare const serviceListSchema: z.ZodObject<{
         customName?: string | undefined;
         zIndex?: number | undefined;
     } | {
-        type: "map" | "compass" | "image";
+        type: "map" | "image" | "compass";
         name: "ptzCompass";
         enabled: 0 | 1;
         id: number;
         width: number;
         height: number;
+        image: string;
         automationType: "manual" | "schedule" | "time" | `input${number}`;
         cameraList: number[];
         pos_x: number;
         pos_y: number;
         coordSystem: "top_left" | "top" | "top_right" | "left" | "center" | "right" | "bottom_left" | "bottom" | "bottom_right";
         scale: number;
-        image: string;
         northPan: number;
         cameraPosX: number;
         cameraPosY: number;
@@ -3559,12 +3559,12 @@ export declare const serviceListSchema: z.ZodObject<{
         id: number;
         width: number;
         height: number;
+        image: string;
         automationType: "manual" | "schedule" | "time" | `input${number}`;
         cameraList: number[];
         pos_x: number;
         pos_y: number;
         coordSystem: "top_left" | "top" | "top_right" | "left" | "center" | "right" | "bottom_left" | "bottom" | "bottom_right";
-        image: string;
         clockFormat: "12h" | "24h";
         background: "custom" | "image";
         customAreaColor: string;
@@ -3825,13 +3825,13 @@ export declare const isCustomGraphics: (service: TService) => service is {
     id: number;
     width: number;
     height: number;
+    image: string;
     automationType: "manual" | "schedule" | "time" | `input${number}`;
     cameraList: number[];
     customName: string;
     pos_x: number;
     pos_y: number;
     coordSystem: "top_left" | "top" | "top_right" | "left" | "center" | "right" | "bottom_left" | "bottom" | "bottom_right";
-    image: string;
     clockFormat: "12h" | "24h";
     background: "custom" | "image";
     customAreaColor: string;
@@ -4001,12 +4001,13 @@ export declare const isPip: (service: TService) => service is {
 };
 export type TPtzCompass = z.infer<typeof ptzCompassSchema>;
 export declare const isPtzCompass: (service: TService) => service is {
-    type: "map" | "compass" | "image";
+    type: "map" | "image" | "compass";
     name: "ptzCompass";
     enabled: 0 | 1;
     id: number;
     width: number;
     height: number;
+    image: string;
     automationType: "manual" | "schedule" | "time" | `input${number}`;
     cameraList: number[];
     customName: string;
@@ -4014,7 +4015,6 @@ export declare const isPtzCompass: (service: TService) => service is {
     pos_y: number;
     coordSystem: "top_left" | "top" | "top_right" | "left" | "center" | "right" | "bottom_left" | "bottom" | "bottom_right";
     scale: number;
-    image: string;
     northPan: number;
     cameraPosX: number;
     cameraPosY: number;

package/cjs/types/CamOverlayAPI/customGraphicsSchema.d.ts

@@ -529,13 +529,13 @@ export declare const customGraphicsSchema: z.ZodObject<{
     id: number;
     width: number;
     height: number;
+    image: string;
     automationType: "manual" | "schedule" | "time" | `input${number}`;
     cameraList: number[];
     customName: string;
     pos_x: number;
     pos_y: number;
     coordSystem: "top_left" | "top" | "top_right" | "left" | "center" | "right" | "bottom_left" | "bottom" | "bottom_right";
-    image: string;
     clockFormat: "12h" | "24h";
     background: "custom" | "image";
     customAreaColor: string;
@@ -609,12 +609,12 @@ export declare const customGraphicsSchema: z.ZodObject<{
     id: number;
     width: number;
     height: number;
+    image: string;
     automationType: "manual" | "schedule" | "time" | `input${number}`;
     cameraList: number[];
     pos_x: number;
     pos_y: number;
     coordSystem: "top_left" | "top" | "top_right" | "left" | "center" | "right" | "bottom_left" | "bottom" | "bottom_right";
-    image: string;
     clockFormat: "12h" | "24h";
     background: "custom" | "image";
     customAreaColor: string;

package/cjs/types/CamOverlayAPI/ptzCompassSchema.d.ts

@@ -32,12 +32,13 @@ export declare const ptzCompassSchema: z.ZodObject<{
     generalAddress: z.ZodOptional<z.ZodString>;
     showDegrees: z.ZodDefault<z.ZodBoolean>;
 }, "strip", z.ZodTypeAny, {
-    type: "map" | "compass" | "image";
+    type: "map" | "image" | "compass";
     name: "ptzCompass";
     enabled: 0 | 1;
     id: number;
     width: number;
     height: number;
+    image: string;
     automationType: "manual" | "schedule" | "time" | `input${number}`;
     cameraList: number[];
     customName: string;
@@ -45,7 +46,6 @@ export declare const ptzCompassSchema: z.ZodObject<{
     pos_y: number;
     coordSystem: "top_left" | "top" | "top_right" | "left" | "center" | "right" | "bottom_left" | "bottom" | "bottom_right";
     scale: number;
-    image: string;
     northPan: number;
     cameraPosX: number;
     cameraPosY: number;
@@ -63,19 +63,19 @@ export declare const ptzCompassSchema: z.ZodObject<{
     generalIframeHeight?: number | undefined;
     generalAddress?: string | undefined;
 }, {
-    type: "map" | "compass" | "image";
+    type: "map" | "image" | "compass";
     name: "ptzCompass";
     enabled: 0 | 1;
     id: number;
     width: number;
     height: number;
+    image: string;
     automationType: "manual" | "schedule" | "time" | `input${number}`;
     cameraList: number[];
     pos_x: number;
     pos_y: number;
     coordSystem: "top_left" | "top" | "top_right" | "left" | "center" | "right" | "bottom_left" | "bottom" | "bottom_right";
     scale: number;
-    image: string;
     northPan: number;
     cameraPosX: number;
     cameraPosY: number;