camstreamerlib 4.0.0-beta.9 → 4.0.0-beta.91

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

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

package/esm/node/DefaultClient.js

@@ -22,29 +22,27 @@ export class DefaultClient {
         }
         this.httpRequestSender = new HttpRequestSender(agentOptions);
     }
-    get url() {
-        return `${this.tls ? 'https' : 'http'}://${this.user}:${this.pass}@${this.ip}:${this.port}`;
-    }
-    async get(path, parameters = {}, headers) {
-        const options = this.getBaseConnectionParams('GET', path, parameters);
-        options.headers = headers;
+    get(params) {
+        const { path, parameters, headers, timeout } = params;
+        const options = this.getBaseConnectionParams('GET', path, parameters, headers, timeout);
         return this.httpRequestSender.sendRequest(options);
     }
-    async post(path, data, parameters = {}, headers) {
-        const options = this.getBaseConnectionParams('POST', path, parameters);
-        options.headers = headers;
+    post(params) {
+        const { path, data, parameters, headers, timeout } = params;
+        const options = this.getBaseConnectionParams('POST', path, parameters, headers, timeout);
         return this.httpRequestSender.sendRequest(options, data);
     }
-    getBaseConnectionParams(method, path, params) {
-        const pathName = addParametersToPath(path, params);
+    getBaseConnectionParams(method, path, params, headers, timeout) {
         return {
             method: method,
             protocol: this.tls ? 'https:' : 'http:',
             host: this.ip,
             port: this.port,
-            path: pathName,
+            path: addParametersToPath(path, params),
             user: this.user,
             pass: this.pass,
+            headers,
+            timeout,
         };
     }
 }

package/esm/node/Digest.test.js

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

package/esm/node/HttpRequestSender.js

@@ -1,4 +1,4 @@
-import { Digest } from '../internal/Digest';
+import { Digest } from './Digest';
 import { Agent, fetch as undiciFetch, Request as UndiciRequest, } from 'undici';
 export class HttpRequestSender {
     agent;
@@ -8,8 +8,18 @@ export class HttpRequestSender {
             connect: { rejectUnauthorized: agentOptions?.rejectUnaurhorized, keepAlive: agentOptions?.keepAlive },
         });
     }
-    sendRequest(options, postData) {
-        return this.sendRequestWithAuth(options, postData);
+    async sendRequest(options, postData) {
+        const stackHolder = { stack: '' };
+        Error.captureStackTrace(stackHolder, this.sendRequest);
+        try {
+            return await this.sendRequestWithAuth(options, postData);
+        }
+        catch (err) {
+            if (err instanceof Error) {
+                err.stack = `${err.stack}\nCaptured at:\n${stackHolder.stack}`;
+            }
+            throw err;
+        }
     }
     async sendRequestWithAuth(options, postData, wwwAuthenticateHeader) {
         options.timeout ??= 10000;
@@ -79,7 +89,7 @@ export class HttpRequestSender {
             return authData.digest.getAuthHeader(options.user, options.pass, options.method ?? 'GET', options.path, authData.wwwAuthenticateHeader);
         }
         else {
-            return `Basic ${btoa(options.user + ':' + options.pass)}`;
+            return `Basic ${Buffer.from(`${options.user}:${options.pass}`).toString('base64')}`;
         }
     }
 }

package/esm/node/HttpServer.js

@@ -2,7 +2,7 @@ import * as http from 'http';
 import * as url from 'url';
 import * as fs from 'fs';
 import * as path from 'path';
-import * as EventEmitter from 'events';
+import { EventEmitter } from 'events';
 export class HttpServer extends EventEmitter {
     host;
     port;

package/esm/node/TimeZoneDaemon.js

@@ -0,0 +1,25 @@
+import { exec } from 'child_process';
+import { promisify } from 'util';
+const execPromise = promisify(exec);
+export class TimeZoneDaemon {
+    checkTimer;
+    constructor(checkInterval = 60000) {
+        this.checkTimer = setInterval(() => this.checkAndUpdateTimeZone(), checkInterval);
+    }
+    stop() {
+        clearInterval(this.checkTimer);
+    }
+    async checkAndUpdateTimeZone() {
+        try {
+            const { stdout } = await execPromise('timedatectl show -p Timezone --value');
+            const systemTimezone = stdout.toString().trim();
+            const nodeTimezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
+            if (systemTimezone !== nodeTimezone) {
+                process.env.TZ = systemTimezone;
+            }
+        }
+        catch (error) {
+            console.error('Error checking/updating timezone:', error);
+        }
+    }
+}

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

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

package/esm/node/WsClient.js

@@ -1,7 +1,6 @@
-import * as EventEmitter from 'events';
-import * as WebSocket from 'ws';
-import { Digest } from '../internal/Digest';
-export class WsClient extends EventEmitter {
+import { WebSocket } from 'ws';
+import { Digest } from './Digest';
+export class WsClient {
     user;
     pass;
     address;
@@ -14,7 +13,6 @@ export class WsClient extends EventEmitter {
     ws;
     isClosed = false;
     constructor(options) {
-        super();
         const tls = options.tls ?? false;
         const tlsInsecure = options.tlsInsecure ?? false;
         const ip = options.ip ?? '127.0.0.1';
@@ -46,10 +44,10 @@ export class WsClient extends EventEmitter {
             }
             this.ws.binaryType = 'arraybuffer';
             this.isAlive = true;
-            this.pingTimer = setInterval(async () => {
+            this.pingTimer = setInterval(() => {
                 if ((this.ws && this.ws.readyState !== WebSocket.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;
@@ -72,23 +70,32 @@ export class WsClient extends EventEmitter {
                     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.");
@@ -97,7 +104,7 @@ export class WsClient extends EventEmitter {
             this.ws.send(data);
         }
     }
-    close() {
+    destroy() {
         if (this.isClosed) {
             return;
         }
@@ -127,7 +134,7 @@ export class WsClient extends EventEmitter {
                     wsCopy.terminate();
                 }
             }, 5000);
-            this.emit('close');
+            this.onClose();
         }
         catch (err) {
             console.error(err);

package/esm/{events → node/events}/AxisCameraStationEvents.js

@@ -1,18 +1,17 @@
-import { DefaultClient } from '../node/DefaultClient';
-import { isClient, pad } from '../internal/common';
+import { pad } from '../../internal/utils';
+import { ProxyClient } from '../../internal/ProxyClient';
+import { DefaultClient } from '../DefaultClient';
 export class AxisCameraStationEvents {
     sourceKey;
     client;
-    constructor(sourceKey, opt = {}) {
+    constructor(clientOptions, sourceKey) {
         this.sourceKey = sourceKey;
-        if (isClient(opt)) {
-            this.client = opt;
-        }
-        else {
-            this.client = new DefaultClient(opt);
-        }
+        this.client = new DefaultClient(clientOptions);
     }
-    async sendEvent(data, eventType) {
+    getClient(proxyParams) {
+        return proxyParams ? new ProxyClient(this.client, proxyParams) : this.client;
+    }
+    async sendEvent(data, eventType, options) {
         const dateString = this.getDate();
         const event = {
             addExternalDataRequest: {
@@ -23,9 +22,15 @@ export class AxisCameraStationEvents {
             },
         };
         const eventData = JSON.stringify(event);
-        const res = await this.client.post('/Acs/Api/ExternalDataFacade/AddExternalData', eventData, undefined, {
-            'Content-Type': 'application/json',
-            'Content-Length': eventData.length.toString(),
+        const agent = this.getClient(options?.proxyParams);
+        const res = await agent.post({
+            path: '/Acs/Api/ExternalDataFacade/AddExternalData',
+            data: eventData,
+            headers: {
+                'Content-Type': 'application/json',
+                'Content-Length': eventData.length.toString(),
+            },
+            timeout: options?.timeout,
         });
         if (!res.ok) {
             throw new Error(`ACS status code: ${res.status}`);

package/esm/node/events/GenetecAgent.js

@@ -0,0 +1,120 @@
+import { ErrorWithResponse } from '../../errors/errors';
+import { pad } from '../../internal/utils';
+import { cameraDetailsResponseSchema, cameraGuidsResponseSchema, successResponseSchema, } from '../../types/GenetecAgent';
+export class GenetecAgent {
+    settings;
+    baseUrl;
+    credentials;
+    constructor(options = {}) {
+        this.settings = {
+            protocol: options.protocol ?? 'http',
+            ip: options.ip ?? '127.0.0.1',
+            port: options.port ?? 80,
+            baseUri: options.baseUri ?? 'WebSdk',
+            user: options.user ?? 'root',
+            pass: options.pass ?? '',
+            appId: options.appId ?? '',
+            timeout: options.timeout ?? 10000,
+        };
+        this.baseUrl = `${this.settings.protocol}://${this.settings.ip}:${this.settings.port}/${this.settings.baseUri}`;
+        this.credentials = btoa(`${this.settings.user};${this.settings.appId}:${this.settings.pass}`);
+    }
+    async checkConnection() {
+        const requestOptions = this.getRequestOptions('GET');
+        const res = await this.fetchWithTimeout(new URL(this.baseUrl), requestOptions);
+        if (!res.ok) {
+            throw new ErrorWithResponse(res);
+        }
+        const responseBody = await res.text();
+        const result = await successResponseSchema.safeParseAsync(JSON.parse(responseBody));
+        if (!result.success) {
+            throw new Error('Genetec connection test failed: ' + JSON.stringify(result.error.issues) + '\n' + responseBody);
+        }
+    }
+    async getAllCameraGuids() {
+        const requestOptions = this.getRequestOptions('GET');
+        const url = new URL(`${this.baseUrl}/report/EntityConfiguration`);
+        url.searchParams.set('q', 'EntityTypes@Camera');
+        const res = await this.fetchWithTimeout(url, requestOptions);
+        if (!res.ok) {
+            throw new ErrorWithResponse(res);
+        }
+        const responseBody = await res.text();
+        const result = await cameraGuidsResponseSchema.safeParseAsync(JSON.parse(responseBody));
+        if (!result.success) {
+            throw new Error('Genetec get camera guids failed: ' + JSON.stringify(result.error.issues) + '\n' + responseBody);
+        }
+        return result.data;
+    }
+    async getCameraDetails(guids, parameters) {
+        const params = parameters.join(',');
+        const requestOptions = this.getRequestOptions('GET');
+        const allCameras = [];
+        const chunkSize = 10;
+        while (guids.length > 0) {
+            const chunk = guids.slice(0, chunkSize);
+            guids.splice(0, chunkSize);
+            const url = new URL(`${this.baseUrl}/entity`);
+            url.searchParams.set('q', chunk.map((item) => `entity=${item.Guid},${params}`).join(','));
+            const res = await this.fetchWithTimeout(url, requestOptions);
+            if (!res.ok) {
+                throw new ErrorWithResponse(res);
+            }
+            const responseBody = await res.text();
+            const result = await cameraDetailsResponseSchema.safeParseAsync(JSON.parse(responseBody));
+            if (!result.success) {
+                throw new Error('Genetec get camera details failed: ' + JSON.stringify(result.error.issues) + '\n' + responseBody);
+            }
+            const data = result.data;
+            const resultArray = Array.isArray(data.Rsp.Result) ? data.Rsp.Result : [data.Rsp.Result];
+            allCameras.push(...resultArray);
+        }
+        return allCameras;
+    }
+    async sendBookmark(guids, bookmarkText) {
+        const timeStamp = this.getTimeStamp();
+        const requestOptions = this.getRequestOptions('POST');
+        const url = new URL(`${this.baseUrl}/action`);
+        url.searchParams.set('q', guids.map((guid) => `AddCameraBookmark(${guid},${timeStamp},${bookmarkText})`).join(','));
+        const res = await this.fetchWithTimeout(url, requestOptions);
+        if (!res.ok) {
+            throw new ErrorWithResponse(res);
+        }
+        const responseBody = await res.text();
+        const result = await successResponseSchema.safeParseAsync(JSON.parse(responseBody));
+        if (!result.success) {
+            throw new Error('Genetec send bookmark failed: ' + JSON.stringify(result.error.issues) + '\n' + responseBody);
+        }
+    }
+    getRequestOptions(method) {
+        return {
+            method,
+            headers: new Headers({
+                Authorization: `Basic ${this.credentials}`,
+                Accept: 'text/json',
+            }),
+            redirect: 'follow',
+        };
+    }
+    getTimeStamp() {
+        const date = new Date();
+        const year = date.getUTCFullYear();
+        const month = pad(date.getUTCMonth() + 1, 2);
+        const day = pad(date.getUTCDate(), 2);
+        const hours = pad(date.getUTCHours(), 2);
+        const minutes = pad(date.getUTCMinutes(), 2);
+        const seconds = pad(date.getUTCSeconds(), 2);
+        const miliSeconds = pad(date.getUTCMilliseconds(), 2);
+        return `${year}-${month}-${day}T${hours}:${minutes}:${seconds}.${miliSeconds}Z`;
+    }
+    async fetchWithTimeout(url, options) {
+        const controller = new AbortController();
+        const timeoutId = setTimeout(() => controller.abort(), this.settings.timeout);
+        try {
+            return await fetch(url, { ...options, signal: controller.signal });
+        }
+        finally {
+            clearTimeout(timeoutId);
+        }
+    }
+}

package/esm/node/index.js

@@ -1,2 +1,18 @@
-export { DefaultClient } from './DefaultClient';
-export { WsClient } from './WsClient';
+export * from './DefaultClient';
+export * from './WsClient';
+export * from './HttpServer';
+export * from './HttpRequestSender';
+export * from './events/AxisCameraStationEvents';
+export * from './TimeZoneDaemon';
+export * from './events/GenetecAgent';
+export * from '../types/GenetecAgent';
+export { ResourceManager } from './CamOverlayPainter/ResourceManager';
+export { Painter } from './CamOverlayPainter/Painter';
+export { Frame } from './CamOverlayPainter/Frame';
+export * from '../types/CamOverlayPainter';
+export { CamOverlayDrawingAPI } from './CamOverlayDrawingAPI';
+export * from '../types/CamOverlayDrawingAPI';
+export { CamScripterAPICameraEventsGenerator } from './CamScripterAPICameraEventsGenerator';
+export * from '../types/CamScripterAPICameraEventsGenerator';
+export { VapixEvents } from './VapixEvents';
+export * from '../types/VapixEvents';

package/esm/types/CamOverlayAPI/CamOverlayAPI.js

@@ -0,0 +1,76 @@
+import { z } from 'zod';
+import { infoTickerSchema } from './infotickerSchema';
+import { accuweatherSchema } from './accuweatherSchema';
+import { ptzCompassSchema } from './ptzCompassSchema';
+import { imagesSchema } from './imagesSchema';
+import { ptzSchema } from './ptzSchema';
+import { pipSchema } from './pipSchema';
+import { customGraphicsSchema } from './customGraphicsSchema';
+import { screenSharingSchema } from './screenSharingSchema';
+import { webCameraSharingSchema } from './webCameraSharingSchema';
+import { baseballScoreBoardAutomaticSchema, baseballScoreBoardSchema, scoreBoardSchema, scoreOverviewSchema, } from './scoreBoardSchema';
+export const wsResponseSchema = z.object({
+    status: z.number(),
+    message: z.string(),
+});
+export const servicesSchema = z.discriminatedUnion('name', [
+    infoTickerSchema,
+    accuweatherSchema,
+    ptzCompassSchema,
+    imagesSchema,
+    ptzSchema,
+    pipSchema,
+    customGraphicsSchema,
+    screenSharingSchema,
+    webCameraSharingSchema,
+    scoreBoardSchema,
+    baseballScoreBoardSchema,
+    baseballScoreBoardAutomaticSchema,
+    scoreOverviewSchema,
+]);
+export const serviceListSchema = z.object({
+    services: z.array(servicesSchema),
+});
+export const isAccuweather = (service) => service.name === 'accuweather';
+export const isCustomGraphics = (service) => service.name === 'customGraphics';
+export const isImages = (service) => service.name === 'images';
+export const isInfoticker = (service) => service.name === 'infoticker';
+export const isPip = (service) => service.name === 'pip';
+export const isPtzCompass = (service) => service.name === 'ptzCompass';
+export const isPtz = (service) => service.name === 'ptz';
+export const isScreenSharing = (service) => service.name === 'screenSharing';
+export const isWebCameraSharing = (service) => service.name === 'web_camera';
+export const isScoreBoard = (service) => service.name === 'scoreBoard';
+export const isBaseballScoreBoard = (service) => service.name === 'baseballScoreBoard';
+export const isBaseballScoreBoardAutomatic = (service) => service.name === 'myBallBaseballWidgets';
+export const isScoreOverview = (service) => service.name === 'scoreOverview';
+export var ImageType;
+(function (ImageType) {
+    ImageType[ImageType["PNG"] = 0] = "PNG";
+    ImageType[ImageType["JPEG"] = 1] = "JPEG";
+})(ImageType || (ImageType = {}));
+export const fileStorageTypeSchema = z.union([
+    z.literal('flash'),
+    z.literal('SD0'),
+    z.literal('ftp'),
+    z.literal('samba'),
+    z.literal('url'),
+]);
+export const storageDataListSchema = z.array(z.object({
+    type: fileStorageTypeSchema,
+    state: z.string(),
+}));
+export const storageResponseSchema = z.object({
+    code: z.number(),
+    list: storageDataListSchema,
+});
+export const fileSchema = z.object({
+    name: z.string(),
+    path: z.string().url(),
+    storage: fileStorageTypeSchema,
+});
+export const fileListSchema = z.array(fileSchema);
+export const fileDataSchema = z.object({
+    code: z.number(),
+    list: fileListSchema,
+});

package/esm/{models → types}/CamOverlayAPI/accuweatherSchema.js

@@ -1,8 +1,7 @@
-import { allowedWidgetNames } from './constants';
-import { coordinateSystemSchema, fontSchema, languageSchema, weatherUnitSchema, widgetCommonSchema, } from './widgetCommonSchema';
 import { z } from 'zod';
-export const accuweatherSchema = widgetCommonSchema.extend({
-    name: z.literal(allowedWidgetNames.accuweather),
+import { serviceNames, coordinateSystemSchema, fontSchema, languageSchema, weatherUnitSchema, serviceCommonSchema, } from './serviceCommonTypes';
+export const accuweatherSchema = serviceCommonSchema.extend({
+    name: z.literal(serviceNames.accuweather),
     location: z.string(),
     locationName: z.string(),
     title: z.string(),

package/esm/{models → types}/CamOverlayAPI/customGraphicsSchema.js

@@ -1,6 +1,5 @@
-import { allowedWidgetNames } from './constants';
-import { coordinateSystemSchema, fontSchema, widgetCommonSchema } from './widgetCommonSchema';
 import { z } from 'zod';
+import { serviceNames, coordinateSystemSchema, fontSchema, serviceCommonSchema } from './serviceCommonTypes';
 const mappingZonesCommonSchema = z.object({
     name: z.string(),
     pos_x: z.number(),
@@ -49,8 +48,8 @@ const mappingZoneCountdownSchema = mappingZonesCommonSchema.extend({
     settings: mappingZonesCountdownSettingsSchema,
 });
 export const mappingZoneSchema = z.discriminatedUnion('type', [mappingZonePlainSchema, mappingZoneCountdownSchema]);
-export const customGraphicsSchema = widgetCommonSchema.extend({
-    name: z.literal(allowedWidgetNames.customGraphics),
+export const customGraphicsSchema = serviceCommonSchema.extend({
+    name: z.literal(serviceNames.customGraphics),
     pos_x: z.number(),
     pos_y: z.number(),
     coordSystem: coordinateSystemSchema,

package/esm/types/CamOverlayAPI/imagesSchema.js

@@ -0,0 +1,6 @@
+import { z } from 'zod';
+import { serviceNames, overlaySchema, serviceCommonSchema } from './serviceCommonTypes';
+export const imagesSchema = serviceCommonSchema.extend({
+    name: z.literal(serviceNames.images),
+    overlayList: z.array(overlaySchema),
+});

package/esm/{models → types}/CamOverlayAPI/index.js

@@ -1,3 +1,5 @@
+export * from './CamOverlayAPI';
+export * from './serviceCommonTypes';
 export * from './accuweatherSchema';
 export * from './customGraphicsSchema';
 export * from './imagesSchema';
@@ -7,7 +9,3 @@ export * from './ptzCompassSchema';
 export * from './ptzSchema';
 export * from './screenSharingSchema';
 export * from './webCameraSharingSchema';
-export * from './widgetCommonSchema';
-export * from './widgetsSchema';
-export * from './constants';
-export * from './fileSchema';

package/esm/{models → types}/CamOverlayAPI/infotickerSchema.js

@@ -1,8 +1,7 @@
-import { allowedWidgetNames } from './constants';
-import { fontSchema, languageSchema, weatherUnitSchema, widgetCommonSchema } from './widgetCommonSchema';
 import { z } from 'zod';
-export const infoTickerSchema = widgetCommonSchema.extend({
-    name: z.literal(allowedWidgetNames.infoticker),
+import { serviceNames, fontSchema, languageSchema, weatherUnitSchema, serviceCommonSchema } from './serviceCommonTypes';
+export const infoTickerSchema = serviceCommonSchema.extend({
+    name: z.literal(serviceNames.infoticker),
     showClock: z.union([z.literal(0), z.literal(1)]),
     clockType: z.union([z.literal('12h'), z.literal('24h')]),
     textColor: z.string(),