camstreamerlib 4.0.0-beta.56 → 4.0.0-beta.57

package/cjs/PlaneTrackerAPI.js

@@ -120,21 +120,21 @@ class PlaneTrackerAPI {
     }
     async getPriorityList(options) {
         const res = await this._getJson(`${BASE_PATH}/package/getPriorityList.cgi`, undefined, options);
-        return PlaneTrackerAPI_1.priorityListSchema.parse(res);
+        return PlaneTrackerAPI_1.priorityListSchema.parse(res).priorityList;
     }
     async setPriorityList(priorityList, options) {
         return await this._postJsonEncoded(`${BASE_PATH}/package/setPriorityList.cgi`, { priorityList }, this.apiUser, options);
     }
     async getWhiteList(options) {
         const res = await this._getJson(`${BASE_PATH}/package/getWhiteList.cgi`, undefined, options);
-        return PlaneTrackerAPI_1.whiteListSchema.parse(res);
+        return PlaneTrackerAPI_1.whiteListSchema.parse(res).whiteList;
     }
     async setWhiteList(whiteList, options) {
         return await this._postJsonEncoded(`${BASE_PATH}/package/setWhiteList.cgi`, { whiteList }, this.apiUser, options);
     }
     async getBlackList(options) {
         const res = await this._getJson(`${BASE_PATH}/package/getBlackList.cgi`, undefined, options);
-        return PlaneTrackerAPI_1.blackListSchema.parse(res);
+        return PlaneTrackerAPI_1.blackListSchema.parse(res).blackList;
     }
     async setBlackList(blackList, options) {
         return await this._postJsonEncoded(`${BASE_PATH}/package/setBlackList.cgi`, { blackList }, this.apiUser, options);
@@ -152,11 +152,30 @@ class PlaneTrackerAPI {
     }
     async goToCoordinates(lat, lon, alt, options) {
         const agent = this.getClient(options?.proxyParams);
-        return (await agent.get({
+        const res = await agent.get({
             path: `${BASE_PATH}/package/goToCoordinates.cgi`,
             parameters: { lat, lon, alt, ...this.apiUser },
             timeout: options?.timeout,
-        }));
+        });
+        if (!res.ok) {
+            const statusText = (await res.json()).statusText;
+            if (res.status === 400 && statusText === 'Cannot set coordinates in automatic mode') {
+                throw new errors_1.CannotSetCoordsInAutoModeError();
+            }
+            if (res.status === 400 && statusText === 'Invalid lat/lon parameters') {
+                throw new errors_1.InvalidLatLngError();
+            }
+            if (res.status === 400 && statusText === 'Invalid alt parameter') {
+                throw new errors_1.InvalidAltitudeError();
+            }
+            if (res.status === 400) {
+                throw new errors_1.BadRequestError(await (0, utils_1.responseStringify)(res));
+            }
+            if (res.status === 500) {
+                throw new errors_1.ServerError();
+            }
+        }
+        return res;
     }
     async checkGenetecConnection(params, options) {
         return await this._postUrlEncoded(`${BASE_PATH}/package/checkGenetecConnection.cgi`, params, options);

package/cjs/errors/errors.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ImportSettingsError = exports.ResetCalibrationError = exports.TimezoneFetchError = exports.TimezoneNotSetupError = exports.UtcTimeFetchError = exports.WsAuthorizationError = exports.StorageDataFetchError = exports.PtzNotSupportedError = exports.AddNewClipError = exports.FetchDeviceInfoError = exports.NoDeviceInfoError = exports.MaxFPSError = exports.SDCardJobError = exports.SDCardActionError = exports.ApplicationAPIError = exports.SettingParameterError = exports.ParameterNotFoundError = exports.JsonParseError = exports.ParsingBlobError = exports.ServiceNotFoundError = exports.ServiceUnavailableError = void 0;
+exports.BadRequestError = exports.ServerError = exports.InvalidAltitudeError = exports.InvalidLatLngError = exports.CannotSetCoordsInAutoModeError = exports.ImportSettingsError = exports.ResetCalibrationError = exports.TimezoneFetchError = exports.TimezoneNotSetupError = exports.UtcTimeFetchError = exports.WsAuthorizationError = exports.StorageDataFetchError = exports.PtzNotSupportedError = exports.AddNewClipError = exports.FetchDeviceInfoError = exports.NoDeviceInfoError = exports.MaxFPSError = exports.SDCardJobError = exports.SDCardActionError = exports.ApplicationAPIError = exports.SettingParameterError = exports.ParameterNotFoundError = exports.JsonParseError = exports.ParsingBlobError = exports.ServiceNotFoundError = exports.ServiceUnavailableError = void 0;
 class ServiceUnavailableError extends Error {
     constructor() {
         super('Service is unavailable.');
@@ -154,3 +154,38 @@ class ImportSettingsError extends Error {
     }
 }
 exports.ImportSettingsError = ImportSettingsError;
+class CannotSetCoordsInAutoModeError extends Error {
+    constructor() {
+        super("The automatic mode doesn't allow control of the camera.");
+        this.name = 'CannotSetCoordsInAutoModeError';
+    }
+}
+exports.CannotSetCoordsInAutoModeError = CannotSetCoordsInAutoModeError;
+class InvalidLatLngError extends Error {
+    constructor() {
+        super('The provided latitude or longitude parameters are invalid.');
+        this.name = 'InvalidLatLngError';
+    }
+}
+exports.InvalidLatLngError = InvalidLatLngError;
+class InvalidAltitudeError extends Error {
+    constructor() {
+        super('The provided altitude parameter is invalid.');
+        this.name = 'InvalidAltitudeError';
+    }
+}
+exports.InvalidAltitudeError = InvalidAltitudeError;
+class ServerError extends Error {
+    constructor() {
+        super('An internal server error occurred.');
+        this.name = 'ServerError';
+    }
+}
+exports.ServerError = ServerError;
+class BadRequestError extends Error {
+    constructor(err) {
+        super('An unknown error occurred: ' + err);
+        this.name = 'UnknownError';
+    }
+}
+exports.BadRequestError = BadRequestError;

package/cjs/internal/WsEvents.js

@@ -2,12 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WsEvents = void 0;
 class WsEvents {
-    zodSchema;
+    validate;
     ws;
     _isDestroyed = false;
     listeners = {};
-    constructor(zodSchema, ws) {
-        this.zodSchema = zodSchema;
+    constructor(validate, ws) {
+        this.validate = validate;
         this.ws = ws;
         this.ws.onMessage = (e) => this.onMessage(e);
     }
@@ -43,7 +43,7 @@ class WsEvents {
         }
         try {
             const eventData = JSON.parse(incomeData.toString());
-            const data = this.zodSchema.parse(eventData);
+            const data = this.validate(eventData);
             if (isInitEvent(data)) {
                 this.processMessage(data.data, true);
                 return;

package/cjs/types/CamScripterAPI.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cameraTimeResponseSchema = exports.camscripterApiResponseSchema = exports.cameraStorageSchema = exports.packageConfigSchema = exports.packageInfoListSchema = exports.nodeStateSchema = void 0;
 const zod_1 = require("zod");
+const common_1 = require("./common");
 exports.nodeStateSchema = zod_1.z.object({
     node_state: zod_1.z.union([zod_1.z.literal('OK'), zod_1.z.literal('NOT_INSTALLED'), zod_1.z.literal('NOT_FOUND')]),
 });
@@ -20,10 +21,10 @@ exports.packageInfoListSchema = zod_1.z.array(zod_1.z.object({
 exports.packageConfigSchema = zod_1.z.record(zod_1.z.string(), zod_1.z.object({ enabled: zod_1.z.boolean() }));
 exports.cameraStorageSchema = zod_1.z.union([
     zod_1.z.tuple([
-        zod_1.z.object({ type: zod_1.z.literal('INTERNAL'), capacity_mb: zod_1.z.number() }),
-        zod_1.z.object({ type: zod_1.z.literal('SD_CARD'), capacity_mb: zod_1.z.number() }),
+        zod_1.z.object({ type: common_1.flashStorageTypeSchema, capacity_mb: zod_1.z.number() }),
+        zod_1.z.object({ type: common_1.sdCardStorageTypeSchema, capacity_mb: zod_1.z.number() }),
     ]),
-    zod_1.z.tuple([zod_1.z.object({ type: zod_1.z.literal('INTERNAL'), capacity_mb: zod_1.z.number() })]),
+    zod_1.z.tuple([zod_1.z.object({ type: common_1.flashStorageTypeSchema, capacity_mb: zod_1.z.number() })]),
 ]);
 exports.camscripterApiResponseSchema = zod_1.z.object({
     status: zod_1.z.number(),

package/cjs/types/common.js

@@ -1,11 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.keyboardShortcutsSchema = exports.keyboardShortcutSchema = exports.networkCameraListSchema = exports.storageTypeSchema = exports.h264ProfileSchema = exports.audioChannelCountSchema = exports.audioChannelSchema = void 0;
+exports.keyboardShortcutsSchema = exports.keyboardShortcutSchema = exports.networkCameraListSchema = exports.storageTypeSchema = exports.sdCardStorageTypeSchema = exports.flashStorageTypeSchema = exports.h264ProfileSchema = exports.audioChannelCountSchema = exports.audioChannelSchema = void 0;
 const zod_1 = require("zod");
 exports.audioChannelSchema = zod_1.z.union([zod_1.z.literal('mono'), zod_1.z.literal('stereo')]);
 exports.audioChannelCountSchema = zod_1.z.union([zod_1.z.literal(1), zod_1.z.literal(2)]);
 exports.h264ProfileSchema = zod_1.z.union([zod_1.z.literal('high'), zod_1.z.literal('main'), zod_1.z.literal('baseline')]);
-exports.storageTypeSchema = zod_1.z.union([zod_1.z.literal('SD_DISK'), zod_1.z.literal('FLASH')]);
+exports.flashStorageTypeSchema = zod_1.z.literal('FLASH');
+exports.sdCardStorageTypeSchema = zod_1.z.literal('SD_DISK');
+exports.storageTypeSchema = zod_1.z.union([exports.sdCardStorageTypeSchema, exports.flashStorageTypeSchema]);
 exports.networkCameraListSchema = zod_1.z.array(zod_1.z.object({
     name: zod_1.z.string(),
     ip: zod_1.z.string(),

package/cjs/types/ws/PlaneTrackerEvents.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ptrEventsSchema = exports.PlaneTrackerUserActions = exports.PlaneTrackerWsEvents = void 0;
+exports.ptrEventsSchema = exports.planeTrackerUserActionData = exports.PlaneTrackerUserActions = exports.PlaneTrackerWsEvents = void 0;
 const zod_1 = require("zod");
+const PlaneTrackerAPI_1 = require("../PlaneTrackerAPI");
 const apiFlightDataSchema = zod_1.z.object({
     icao: zod_1.z.string(),
     lat: zod_1.z.number(),
@@ -54,6 +55,81 @@ var PlaneTrackerUserActions;
     PlaneTrackerUserActions["LOCK_API"] = "lockApi.cgi";
     PlaneTrackerUserActions["UNLOCK_API"] = "unlockApi.cgi";
 })(PlaneTrackerUserActions || (exports.PlaneTrackerUserActions = PlaneTrackerUserActions = {}));
+exports.planeTrackerUserActionData = zod_1.z.discriminatedUnion('cgi', [
+    zod_1.z.object({
+        cgi: zod_1.z.literal(PlaneTrackerUserActions.TRACK_ICAO),
+        ip: zod_1.z.string(),
+        params: apiStringUserSchema.extend({
+            icao: zod_1.z.string(),
+        }),
+    }),
+    zod_1.z.object({
+        cgi: zod_1.z.literal(PlaneTrackerUserActions.RESET_ICAO),
+        ip: zod_1.z.string(),
+        params: apiStringUserSchema,
+    }),
+    zod_1.z.object({
+        cgi: zod_1.z.literal(PlaneTrackerUserActions.SET_PRIORITY_LIST),
+        ip: zod_1.z.string(),
+        params: apiStringUserSchema,
+        postJsonBody: zod_1.z.object({
+            priorityList: zod_1.z.array(zod_1.z.string()),
+        }),
+    }),
+    zod_1.z.object({
+        cgi: zod_1.z.literal(PlaneTrackerUserActions.SET_BLACK_LIST),
+        ip: zod_1.z.string(),
+        params: apiStringUserSchema,
+        postJsonBody: zod_1.z.object({
+            blackList: zod_1.z.array(zod_1.z.string()),
+        }),
+    }),
+    zod_1.z.object({
+        cgi: zod_1.z.literal(PlaneTrackerUserActions.SET_WHITE_LIST),
+        ip: zod_1.z.string(),
+        params: apiStringUserSchema,
+        postJsonBody: zod_1.z.object({
+            whiteList: zod_1.z.array(zod_1.z.string()),
+        }),
+    }),
+    zod_1.z.object({
+        cgi: zod_1.z.literal(PlaneTrackerUserActions.GO_TO_COORDINATES),
+        ip: zod_1.z.string(),
+        params: apiStringUserSchema.extend({
+            lat: zod_1.z.string(),
+            lon: zod_1.z.string(),
+        }),
+    }),
+    zod_1.z.object({
+        cgi: zod_1.z.literal(PlaneTrackerUserActions.SET_TRACKING_MODE),
+        ip: zod_1.z.string(),
+        params: apiStringUserSchema,
+        postJsonBody: PlaneTrackerAPI_1.trackingModeSchema,
+    }),
+    zod_1.z.object({
+        cgi: zod_1.z.literal(PlaneTrackerUserActions.SET_ZONES),
+        ip: zod_1.z.string(),
+        params: apiStringUserSchema,
+        postJsonBody: PlaneTrackerAPI_1.zonesSchema,
+    }),
+    zod_1.z.object({
+        cgi: zod_1.z.literal(PlaneTrackerUserActions.RESET_PTZ_CALIBRATION),
+        ip: zod_1.z.string(),
+        params: apiStringUserSchema,
+    }),
+    zod_1.z.object({
+        cgi: zod_1.z.literal(PlaneTrackerUserActions.LOCK_API),
+        ip: zod_1.z.string(),
+        params: apiStringUserSchema.extend({
+            timeout: zod_1.z.string(),
+        }),
+    }),
+    zod_1.z.object({
+        cgi: zod_1.z.literal(PlaneTrackerUserActions.UNLOCK_API),
+        ip: zod_1.z.string(),
+        params: apiStringUserSchema,
+    }),
+]);
 const ptrEventsDataSchema = zod_1.z.discriminatedUnion('type', [
     zod_1.z.object({
         type: zod_1.z.literal('CAMERA_POSITION'),

package/cjs/ws/CamOverlayEvents.js

@@ -6,7 +6,7 @@ const CamOverlayEvents_1 = require("../types/ws/CamOverlayEvents");
 class CamOverlayEvents extends WsEvents_1.WsEvents {
     getAuthToken;
     constructor(ws, getAuthToken) {
-        super(CamOverlayEvents_1.coEventsSchema, ws);
+        super((data) => CamOverlayEvents_1.coEventsSchema.parse(data), ws);
         this.getAuthToken = getAuthToken;
         this.ws.onOpen = this.sendInitMsg;
     }

package/cjs/ws/CamStreamerEvents.js

@@ -6,7 +6,7 @@ const CamStreamerEvents_1 = require("../types/ws/CamStreamerEvents");
 class CamStreamerEvents extends WsEvents_1.WsEvents {
     getAuthToken;
     constructor(ws, getAuthToken) {
-        super(CamStreamerEvents_1.csEventsSchema, ws);
+        super((data) => CamStreamerEvents_1.csEventsSchema.parse(data), ws);
         this.getAuthToken = getAuthToken;
         this.ws.onOpen = this.sendInitMsg;
     }

package/cjs/ws/CamSwitcherEvents.js

@@ -6,7 +6,7 @@ const CamSwitcherEvents_1 = require("../types/ws/CamSwitcherEvents");
 class CamSwitcherEvents extends WsEvents_1.WsEvents {
     getAuthToken;
     constructor(ws, getAuthToken) {
-        super(CamSwitcherEvents_1.cswEventsSchema, ws);
+        super((data) => CamSwitcherEvents_1.cswEventsSchema.parse(data), ws);
         this.getAuthToken = getAuthToken;
         this.ws.onOpen = this.sendInitMsg;
     }

package/cjs/ws/PlaneTrackerEvents.js

@@ -6,7 +6,15 @@ const PlaneTrackerEvents_1 = require("../types/ws/PlaneTrackerEvents");
 class PlaneTrackerEvents extends WsEvents_1.WsEvents {
     _apiUser;
     constructor(ws, _apiUser) {
-        super(PlaneTrackerEvents_1.ptrEventsSchema, ws);
+        super((data) => {
+            const parsedData = PlaneTrackerEvents_1.ptrEventsSchema.parse(data);
+            if (parsedData.type === PlaneTrackerEvents_1.PlaneTrackerWsEvents.USER_ACTION) {
+                const { type, ...actionData } = parsedData;
+                const userAction = PlaneTrackerEvents_1.planeTrackerUserActionData.parse(actionData);
+                return { ...userAction, type };
+            }
+            return parsedData;
+        }, ws);
         this._apiUser = _apiUser;
         this.ws.onOpen = this.sendInitMsg;
     }

package/esm/PlaneTrackerAPI.js

@@ -1,7 +1,7 @@
 import { z } from 'zod';
 import { paramToUrl, responseStringify } from './internal/utils';
 import { blackListSchema, cameraSettingsSchema, flightInfoSchema, getIcaoSchema, mapInfoSchema, priorityListSchema, serverSettingsSchema, trackingModeSchema, whiteListSchema, wsAliasResponseSchema, zonesSchema, } from './types/PlaneTrackerAPI';
-import { ImportSettingsError, ParsingBlobError, ResetCalibrationError } from './errors/errors';
+import { CannotSetCoordsInAutoModeError, ImportSettingsError, InvalidAltitudeError, InvalidLatLngError, ParsingBlobError, ResetCalibrationError, ServerError, BadRequestError, } from './errors/errors';
 import { ProxyClient } from './internal/ProxyClient';
 import { cameraListSchema } from './types/GenetecAgent';
 const BASE_PATH = '/local/planetracker';
@@ -117,21 +117,21 @@ export class PlaneTrackerAPI {
     }
     async getPriorityList(options) {
         const res = await this._getJson(`${BASE_PATH}/package/getPriorityList.cgi`, undefined, options);
-        return priorityListSchema.parse(res);
+        return priorityListSchema.parse(res).priorityList;
     }
     async setPriorityList(priorityList, options) {
         return await this._postJsonEncoded(`${BASE_PATH}/package/setPriorityList.cgi`, { priorityList }, this.apiUser, options);
     }
     async getWhiteList(options) {
         const res = await this._getJson(`${BASE_PATH}/package/getWhiteList.cgi`, undefined, options);
-        return whiteListSchema.parse(res);
+        return whiteListSchema.parse(res).whiteList;
     }
     async setWhiteList(whiteList, options) {
         return await this._postJsonEncoded(`${BASE_PATH}/package/setWhiteList.cgi`, { whiteList }, this.apiUser, options);
     }
     async getBlackList(options) {
         const res = await this._getJson(`${BASE_PATH}/package/getBlackList.cgi`, undefined, options);
-        return blackListSchema.parse(res);
+        return blackListSchema.parse(res).blackList;
     }
     async setBlackList(blackList, options) {
         return await this._postJsonEncoded(`${BASE_PATH}/package/setBlackList.cgi`, { blackList }, this.apiUser, options);
@@ -149,11 +149,30 @@ export class PlaneTrackerAPI {
     }
     async goToCoordinates(lat, lon, alt, options) {
         const agent = this.getClient(options?.proxyParams);
-        return (await agent.get({
+        const res = await agent.get({
             path: `${BASE_PATH}/package/goToCoordinates.cgi`,
             parameters: { lat, lon, alt, ...this.apiUser },
             timeout: options?.timeout,
-        }));
+        });
+        if (!res.ok) {
+            const statusText = (await res.json()).statusText;
+            if (res.status === 400 && statusText === 'Cannot set coordinates in automatic mode') {
+                throw new CannotSetCoordsInAutoModeError();
+            }
+            if (res.status === 400 && statusText === 'Invalid lat/lon parameters') {
+                throw new InvalidLatLngError();
+            }
+            if (res.status === 400 && statusText === 'Invalid alt parameter') {
+                throw new InvalidAltitudeError();
+            }
+            if (res.status === 400) {
+                throw new BadRequestError(await responseStringify(res));
+            }
+            if (res.status === 500) {
+                throw new ServerError();
+            }
+        }
+        return res;
     }
     async checkGenetecConnection(params, options) {
         return await this._postUrlEncoded(`${BASE_PATH}/package/checkGenetecConnection.cgi`, params, options);

package/esm/errors/errors.js

@@ -130,3 +130,33 @@ export class ImportSettingsError extends Error {
         this.name = 'ImportSettingsError';
     }
 }
+export class CannotSetCoordsInAutoModeError extends Error {
+    constructor() {
+        super("The automatic mode doesn't allow control of the camera.");
+        this.name = 'CannotSetCoordsInAutoModeError';
+    }
+}
+export class InvalidLatLngError extends Error {
+    constructor() {
+        super('The provided latitude or longitude parameters are invalid.');
+        this.name = 'InvalidLatLngError';
+    }
+}
+export class InvalidAltitudeError extends Error {
+    constructor() {
+        super('The provided altitude parameter is invalid.');
+        this.name = 'InvalidAltitudeError';
+    }
+}
+export class ServerError extends Error {
+    constructor() {
+        super('An internal server error occurred.');
+        this.name = 'ServerError';
+    }
+}
+export class BadRequestError extends Error {
+    constructor(err) {
+        super('An unknown error occurred: ' + err);
+        this.name = 'UnknownError';
+    }
+}

package/esm/internal/WsEvents.js

@@ -1,10 +1,10 @@
 export class WsEvents {
-    zodSchema;
+    validate;
     ws;
     _isDestroyed = false;
     listeners = {};
-    constructor(zodSchema, ws) {
-        this.zodSchema = zodSchema;
+    constructor(validate, ws) {
+        this.validate = validate;
         this.ws = ws;
         this.ws.onMessage = (e) => this.onMessage(e);
     }
@@ -40,7 +40,7 @@ export class WsEvents {
         }
         try {
             const eventData = JSON.parse(incomeData.toString());
-            const data = this.zodSchema.parse(eventData);
+            const data = this.validate(eventData);
             if (isInitEvent(data)) {
                 this.processMessage(data.data, true);
                 return;

package/esm/types/CamScripterAPI.js

@@ -1,4 +1,5 @@
 import { z } from 'zod';
+import { flashStorageTypeSchema, sdCardStorageTypeSchema } from './common';
 export const nodeStateSchema = z.object({
     node_state: z.union([z.literal('OK'), z.literal('NOT_INSTALLED'), z.literal('NOT_FOUND')]),
 });
@@ -17,10 +18,10 @@ export const packageInfoListSchema = z.array(z.object({
 export const packageConfigSchema = z.record(z.string(), z.object({ enabled: z.boolean() }));
 export const cameraStorageSchema = z.union([
     z.tuple([
-        z.object({ type: z.literal('INTERNAL'), capacity_mb: z.number() }),
-        z.object({ type: z.literal('SD_CARD'), capacity_mb: z.number() }),
+        z.object({ type: flashStorageTypeSchema, capacity_mb: z.number() }),
+        z.object({ type: sdCardStorageTypeSchema, capacity_mb: z.number() }),
     ]),
-    z.tuple([z.object({ type: z.literal('INTERNAL'), capacity_mb: z.number() })]),
+    z.tuple([z.object({ type: flashStorageTypeSchema, capacity_mb: z.number() })]),
 ]);
 export const camscripterApiResponseSchema = z.object({
     status: z.number(),

package/esm/types/common.js

@@ -2,7 +2,9 @@ import { z } from 'zod';
 export const audioChannelSchema = z.union([z.literal('mono'), z.literal('stereo')]);
 export const audioChannelCountSchema = z.union([z.literal(1), z.literal(2)]);
 export const h264ProfileSchema = z.union([z.literal('high'), z.literal('main'), z.literal('baseline')]);
-export const storageTypeSchema = z.union([z.literal('SD_DISK'), z.literal('FLASH')]);
+export const flashStorageTypeSchema = z.literal('FLASH');
+export const sdCardStorageTypeSchema = z.literal('SD_DISK');
+export const storageTypeSchema = z.union([sdCardStorageTypeSchema, flashStorageTypeSchema]);
 export const networkCameraListSchema = z.array(z.object({
     name: z.string(),
     ip: z.string(),

package/esm/types/ws/PlaneTrackerEvents.js

@@ -1,4 +1,5 @@
 import { z } from 'zod';
+import { trackingModeSchema, zonesSchema } from '../PlaneTrackerAPI';
 const apiFlightDataSchema = z.object({
     icao: z.string(),
     lat: z.number(),
@@ -51,6 +52,81 @@ export var PlaneTrackerUserActions;
     PlaneTrackerUserActions["LOCK_API"] = "lockApi.cgi";
     PlaneTrackerUserActions["UNLOCK_API"] = "unlockApi.cgi";
 })(PlaneTrackerUserActions || (PlaneTrackerUserActions = {}));
+export const planeTrackerUserActionData = z.discriminatedUnion('cgi', [
+    z.object({
+        cgi: z.literal(PlaneTrackerUserActions.TRACK_ICAO),
+        ip: z.string(),
+        params: apiStringUserSchema.extend({
+            icao: z.string(),
+        }),
+    }),
+    z.object({
+        cgi: z.literal(PlaneTrackerUserActions.RESET_ICAO),
+        ip: z.string(),
+        params: apiStringUserSchema,
+    }),
+    z.object({
+        cgi: z.literal(PlaneTrackerUserActions.SET_PRIORITY_LIST),
+        ip: z.string(),
+        params: apiStringUserSchema,
+        postJsonBody: z.object({
+            priorityList: z.array(z.string()),
+        }),
+    }),
+    z.object({
+        cgi: z.literal(PlaneTrackerUserActions.SET_BLACK_LIST),
+        ip: z.string(),
+        params: apiStringUserSchema,
+        postJsonBody: z.object({
+            blackList: z.array(z.string()),
+        }),
+    }),
+    z.object({
+        cgi: z.literal(PlaneTrackerUserActions.SET_WHITE_LIST),
+        ip: z.string(),
+        params: apiStringUserSchema,
+        postJsonBody: z.object({
+            whiteList: z.array(z.string()),
+        }),
+    }),
+    z.object({
+        cgi: z.literal(PlaneTrackerUserActions.GO_TO_COORDINATES),
+        ip: z.string(),
+        params: apiStringUserSchema.extend({
+            lat: z.string(),
+            lon: z.string(),
+        }),
+    }),
+    z.object({
+        cgi: z.literal(PlaneTrackerUserActions.SET_TRACKING_MODE),
+        ip: z.string(),
+        params: apiStringUserSchema,
+        postJsonBody: trackingModeSchema,
+    }),
+    z.object({
+        cgi: z.literal(PlaneTrackerUserActions.SET_ZONES),
+        ip: z.string(),
+        params: apiStringUserSchema,
+        postJsonBody: zonesSchema,
+    }),
+    z.object({
+        cgi: z.literal(PlaneTrackerUserActions.RESET_PTZ_CALIBRATION),
+        ip: z.string(),
+        params: apiStringUserSchema,
+    }),
+    z.object({
+        cgi: z.literal(PlaneTrackerUserActions.LOCK_API),
+        ip: z.string(),
+        params: apiStringUserSchema.extend({
+            timeout: z.string(),
+        }),
+    }),
+    z.object({
+        cgi: z.literal(PlaneTrackerUserActions.UNLOCK_API),
+        ip: z.string(),
+        params: apiStringUserSchema,
+    }),
+]);
 const ptrEventsDataSchema = z.discriminatedUnion('type', [
     z.object({
         type: z.literal('CAMERA_POSITION'),

package/esm/ws/CamOverlayEvents.js

@@ -3,7 +3,7 @@ import { coEventsSchema } from '../types/ws/CamOverlayEvents';
 export class CamOverlayEvents extends WsEvents {
     getAuthToken;
     constructor(ws, getAuthToken) {
-        super(coEventsSchema, ws);
+        super((data) => coEventsSchema.parse(data), ws);
         this.getAuthToken = getAuthToken;
         this.ws.onOpen = this.sendInitMsg;
     }

package/esm/ws/CamStreamerEvents.js

@@ -3,7 +3,7 @@ import { csEventsSchema } from '../types/ws/CamStreamerEvents';
 export class CamStreamerEvents extends WsEvents {
     getAuthToken;
     constructor(ws, getAuthToken) {
-        super(csEventsSchema, ws);
+        super((data) => csEventsSchema.parse(data), ws);
         this.getAuthToken = getAuthToken;
         this.ws.onOpen = this.sendInitMsg;
     }

package/esm/ws/CamSwitcherEvents.js

@@ -3,7 +3,7 @@ import { cswEventsSchema } from '../types/ws/CamSwitcherEvents';
 export class CamSwitcherEvents extends WsEvents {
     getAuthToken;
     constructor(ws, getAuthToken) {
-        super(cswEventsSchema, ws);
+        super((data) => cswEventsSchema.parse(data), ws);
         this.getAuthToken = getAuthToken;
         this.ws.onOpen = this.sendInitMsg;
     }

package/esm/ws/PlaneTrackerEvents.js

@@ -1,9 +1,17 @@
 import { WsEvents } from '../internal/WsEvents';
-import { ptrEventsSchema } from '../types/ws/PlaneTrackerEvents';
+import { PlaneTrackerWsEvents, planeTrackerUserActionData, ptrEventsSchema, } from '../types/ws/PlaneTrackerEvents';
 export class PlaneTrackerEvents extends WsEvents {
     _apiUser;
     constructor(ws, _apiUser) {
-        super(ptrEventsSchema, ws);
+        super((data) => {
+            const parsedData = ptrEventsSchema.parse(data);
+            if (parsedData.type === PlaneTrackerWsEvents.USER_ACTION) {
+                const { type, ...actionData } = parsedData;
+                const userAction = planeTrackerUserActionData.parse(actionData);
+                return { ...userAction, type };
+            }
+            return parsedData;
+        }, ws);
         this._apiUser = _apiUser;
         this.ws.onOpen = this.sendInitMsg;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "camstreamerlib",
-    "version": "4.0.0-beta.56",
+    "version": "4.0.0-beta.57",
     "description": "Helper library for CamStreamer ACAP applications.",
     "prettier": "@camstreamer/prettier-config",
     "engine": {

package/types/CamScripterAPI.d.ts

@@ -12,13 +12,13 @@ export declare class CamScripterAPI<Client extends IClient<TResponse, any>> {
         ip: string;
     }[]>;
     getStorageInfo(options?: THttpRequestOptions): Promise<[{
-        type: "INTERNAL";
+        type: "FLASH";
         capacity_mb: number;
     }, {
-        type: "SD_CARD";
+        type: "SD_DISK";
         capacity_mb: number;
     }] | [{
-        type: "INTERNAL";
+        type: "FLASH";
         capacity_mb: number;
     }]>;
     getPackageList(options?: THttpRequestOptions): Promise<{