camstreamerlib 4.0.5 → 4.0.7

package/cjs/types/ws/PlaneTrackerEvents.js

@@ -1,10 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ptrEventsSchema = exports.planeTrackerUserActionData = exports.PlaneTrackerUserActions = exports.PlaneTrackerWsEvents = void 0;
+exports.ptrEventsSchema = exports.wsUserActionData = exports.EUserActions = void 0;
 const zod_1 = require("zod");
 const PlaneTrackerAPI_1 = require("../PlaneTrackerAPI");
-const apiFlightDataSchema = zod_1.z.object({
+const wsApiFlightDataSchema = zod_1.z.object({
+    targetId: zod_1.z.string(),
     icao: zod_1.z.string(),
+    domain: PlaneTrackerAPI_1.domainIdSchema,
+    categoryId: zod_1.z.string(),
+    groupId: zod_1.z.string().optional(),
     lat: zod_1.z.number(),
     lon: zod_1.z.number(),
     heading: zod_1.z.number(),
@@ -15,7 +19,6 @@ const apiFlightDataSchema = zod_1.z.object({
     whiteListed: zod_1.z.boolean(),
     blackListed: zod_1.z.boolean(),
     priorityListed: zod_1.z.boolean(),
-    typePriorityListed: zod_1.z.boolean().default(false),
     autoSelectionIgnored: zod_1.z.boolean(),
     signalQuality: zod_1.z.number(),
     emitterCategorySet: zod_1.z.number().default(4),
@@ -23,6 +26,13 @@ const apiFlightDataSchema = zod_1.z.object({
     emergencyState: zod_1.z.boolean(),
     emergencyStatusMessage: zod_1.z.string(),
 });
+const wsCameraPositionDataSchema = zod_1.z.object({
+    lat: zod_1.z.number(),
+    lon: zod_1.z.number(),
+    azimuth: zod_1.z.number().min(0).max(360),
+    elevation: zod_1.z.number().min(-90).max(90),
+    fov: zod_1.z.number(),
+});
 const apiUserSchema = zod_1.z.object({
     userId: zod_1.z.string(),
     userName: zod_1.z.string(),
@@ -34,78 +44,53 @@ const apiStringUserSchema = zod_1.z.object({
     userName: zod_1.z.string(),
     userPriority: zod_1.z.string(),
 });
-var PlaneTrackerWsEvents;
-(function (PlaneTrackerWsEvents) {
-    PlaneTrackerWsEvents["FLIGHT_LIST"] = "FLIGHT_LIST";
-    PlaneTrackerWsEvents["CAMERA_POSITION"] = "CAMERA_POSITION";
-    PlaneTrackerWsEvents["TRACKING_START"] = "TRACKING_START";
-    PlaneTrackerWsEvents["TRACKING_STOP"] = "TRACKING_STOP";
-    PlaneTrackerWsEvents["USER_ACTION"] = "USER_ACTION";
-    PlaneTrackerWsEvents["CONNECTED_USERS"] = "CONNECTED_USERS";
-    PlaneTrackerWsEvents["FORCE_TRACKING_STATUS"] = "FORCE_TRACKING_STATUS";
-})(PlaneTrackerWsEvents || (exports.PlaneTrackerWsEvents = PlaneTrackerWsEvents = {}));
-var PlaneTrackerUserActions;
-(function (PlaneTrackerUserActions) {
-    PlaneTrackerUserActions["TRACK_ICAO"] = "trackIcao.cgi";
-    PlaneTrackerUserActions["RESET_ICAO"] = "resetIcao.cgi";
-    PlaneTrackerUserActions["SET_PRIORITY_LIST"] = "setPriorityList.cgi";
-    PlaneTrackerUserActions["SET_TYPE_PRIORITY_LIST"] = "setTypePriorityList.cgi";
-    PlaneTrackerUserActions["SET_BLACK_LIST"] = "setBlackList.cgi";
-    PlaneTrackerUserActions["SET_WHITE_LIST"] = "setWhiteList.cgi";
-    PlaneTrackerUserActions["GO_TO_COORDINATES"] = "goToCoordinates.cgi";
-    PlaneTrackerUserActions["SET_TRACKING_MODE"] = "setTrackingMode.cgi";
-    PlaneTrackerUserActions["SET_ZONES"] = "setZones.cgi";
-    PlaneTrackerUserActions["RESET_PTZ_CALIBRATION"] = "resetPtzCalibration.cgi";
-    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),
+var EUserActions;
+(function (EUserActions) {
+    EUserActions["TRACK_ICAO"] = "trackIcao.cgi";
+    EUserActions["RESET_ICAO"] = "resetIcao.cgi";
+    EUserActions["SET_PRIORITY_LIST"] = "setPriorityList.cgi";
+    EUserActions["SET_BLACK_LIST"] = "setBlackList.cgi";
+    EUserActions["SET_WHITE_LIST"] = "setWhiteList.cgi";
+    EUserActions["GO_TO_COORDINATES"] = "goToCoordinates.cgi";
+    EUserActions["SET_TRACKING_MODE"] = "setTrackingMode.cgi";
+    EUserActions["SET_ZONES"] = "setZones.cgi";
+    EUserActions["RESET_PTZ_CALIBRATION"] = "resetPtzCalibration.cgi";
+    EUserActions["LOCK_API"] = "lockApi.cgi";
+    EUserActions["UNLOCK_API"] = "unlockApi.cgi";
+})(EUserActions || (exports.EUserActions = EUserActions = {}));
+exports.wsUserActionData = zod_1.z.discriminatedUnion('cgi', [
+    zod_1.z.object({
+        cgi: zod_1.z.literal(EUserActions.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),
+        cgi: zod_1.z.literal(EUserActions.RESET_ICAO),
         ip: zod_1.z.string(),
         params: apiStringUserSchema,
     }),
     zod_1.z.object({
-        cgi: zod_1.z.literal(PlaneTrackerUserActions.SET_PRIORITY_LIST),
+        cgi: zod_1.z.literal(EUserActions.SET_PRIORITY_LIST),
         ip: zod_1.z.string(),
         params: apiStringUserSchema,
-        postJsonBody: zod_1.z.object({
-            priorityList: zod_1.z.array(zod_1.z.string()),
-        }),
+        postJsonBody: PlaneTrackerAPI_1.priorityListSchema,
     }),
     zod_1.z.object({
-        cgi: zod_1.z.literal(PlaneTrackerUserActions.SET_TYPE_PRIORITY_LIST),
+        cgi: zod_1.z.literal(EUserActions.SET_BLACK_LIST),
         ip: zod_1.z.string(),
         params: apiStringUserSchema,
-        postJsonBody: zod_1.z.object({
-            typePriorityList: zod_1.z.array(zod_1.z.string()),
-        }),
+        postJsonBody: PlaneTrackerAPI_1.blackListSchema,
     }),
     zod_1.z.object({
-        cgi: zod_1.z.literal(PlaneTrackerUserActions.SET_BLACK_LIST),
+        cgi: zod_1.z.literal(EUserActions.SET_WHITE_LIST),
         ip: zod_1.z.string(),
         params: apiStringUserSchema,
-        postJsonBody: zod_1.z.object({
-            blackList: zod_1.z.array(zod_1.z.string()),
-        }),
+        postJsonBody: PlaneTrackerAPI_1.whiteListSchema,
     }),
     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),
+        cgi: zod_1.z.literal(EUserActions.GO_TO_COORDINATES),
         ip: zod_1.z.string(),
         params: apiStringUserSchema.extend({
             lat: zod_1.z.string(),
@@ -113,44 +98,41 @@ exports.planeTrackerUserActionData = zod_1.z.discriminatedUnion('cgi', [
         }),
     }),
     zod_1.z.object({
-        cgi: zod_1.z.literal(PlaneTrackerUserActions.SET_TRACKING_MODE),
+        cgi: zod_1.z.literal(EUserActions.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),
+        cgi: zod_1.z.literal(EUserActions.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),
+        cgi: zod_1.z.literal(EUserActions.RESET_PTZ_CALIBRATION),
         ip: zod_1.z.string(),
         params: apiStringUserSchema,
     }),
     zod_1.z.object({
-        cgi: zod_1.z.literal(PlaneTrackerUserActions.LOCK_API),
+        cgi: zod_1.z.literal(EUserActions.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),
+        cgi: zod_1.z.literal(EUserActions.UNLOCK_API),
         ip: zod_1.z.string(),
         params: apiStringUserSchema,
     }),
 ]);
-const ptrEventsDataSchema = zod_1.z.discriminatedUnion('type', [
-    zod_1.z.object({
+const eventsDataSchema = zod_1.z.discriminatedUnion('type', [
+    zod_1.z
+        .object({
         type: zod_1.z.literal('CAMERA_POSITION'),
-        lat: zod_1.z.number(),
-        lon: zod_1.z.number(),
-        azimuth: zod_1.z.number().min(0).max(360),
-        elevation: zod_1.z.number().min(-90).max(90),
-        fov: zod_1.z.number(),
-    }),
+    })
+        .merge(wsCameraPositionDataSchema),
     zod_1.z.object({
         type: zod_1.z.literal('TRACKING_START'),
         icao: zod_1.z.string(),
@@ -160,7 +142,7 @@ const ptrEventsDataSchema = zod_1.z.discriminatedUnion('type', [
     }),
     zod_1.z.object({
         type: zod_1.z.literal('FLIGHT_LIST'),
-        list: zod_1.z.array(apiFlightDataSchema),
+        list: zod_1.z.array(wsApiFlightDataSchema),
     }),
     zod_1.z.object({
         type: zod_1.z.literal('USER_ACTION'),
@@ -171,18 +153,17 @@ const ptrEventsDataSchema = zod_1.z.discriminatedUnion('type', [
             timeout: zod_1.z.string().optional(),
         }),
         cgi: zod_1.z.enum([
-            PlaneTrackerUserActions.TRACK_ICAO,
-            PlaneTrackerUserActions.RESET_ICAO,
-            PlaneTrackerUserActions.SET_PRIORITY_LIST,
-            PlaneTrackerUserActions.SET_TYPE_PRIORITY_LIST,
-            PlaneTrackerUserActions.SET_BLACK_LIST,
-            PlaneTrackerUserActions.SET_WHITE_LIST,
-            PlaneTrackerUserActions.GO_TO_COORDINATES,
-            PlaneTrackerUserActions.SET_TRACKING_MODE,
-            PlaneTrackerUserActions.SET_ZONES,
-            PlaneTrackerUserActions.RESET_PTZ_CALIBRATION,
-            PlaneTrackerUserActions.LOCK_API,
-            PlaneTrackerUserActions.UNLOCK_API,
+            EUserActions.TRACK_ICAO,
+            EUserActions.RESET_ICAO,
+            EUserActions.SET_PRIORITY_LIST,
+            EUserActions.SET_BLACK_LIST,
+            EUserActions.SET_WHITE_LIST,
+            EUserActions.GO_TO_COORDINATES,
+            EUserActions.SET_TRACKING_MODE,
+            EUserActions.SET_ZONES,
+            EUserActions.RESET_PTZ_CALIBRATION,
+            EUserActions.LOCK_API,
+            EUserActions.UNLOCK_API,
         ]),
         postJsonBody: zod_1.z.any(),
     }),
@@ -202,6 +183,6 @@ const ptrEventsDataSchema = zod_1.z.discriminatedUnion('type', [
     }),
 ]);
 exports.ptrEventsSchema = zod_1.z.discriminatedUnion('type', [
-    zod_1.z.object({ type: zod_1.z.literal('init'), data: ptrEventsDataSchema }),
-    ...ptrEventsDataSchema.options,
+    zod_1.z.object({ type: zod_1.z.literal('init'), data: eventsDataSchema }),
+    ...eventsDataSchema.options,
 ]);

package/cjs/ws/PlaneTrackerEvents.d.ts

@@ -1,9 +1,8 @@
 import { IWsClient } from '../internal/types';
 import { WsEvents } from '../internal/WsEvents';
-import { TApiUser } from '../types/PlaneTrackerAPI';
-import { TPlaneTrackerEvent } from '../types/ws/PlaneTrackerEvents';
-export declare class PlaneTrackerEvents extends WsEvents<TPlaneTrackerEvent> {
+import { TEventData, TApiUser } from '../types/ws/PlaneTrackerEvents';
+export declare class PlaneTrackerEvents extends WsEvents<TEventData> {
     private _apiUser;
-    constructor(ws: IWsClient, _apiUser: TApiUser);
+    constructor(ws: IWsClient, _apiUser: Omit<TApiUser, 'ip'>);
     private sendInitMsg;
 }

package/cjs/ws/PlaneTrackerEvents.js

@@ -8,9 +8,9 @@ class PlaneTrackerEvents extends WsEvents_1.WsEvents {
     constructor(ws, _apiUser) {
         super((data) => {
             const parsedData = PlaneTrackerEvents_1.ptrEventsSchema.parse(data);
-            if (parsedData.type === PlaneTrackerEvents_1.PlaneTrackerWsEvents.USER_ACTION) {
+            if (parsedData.type === 'USER_ACTION') {
                 const { type, ...actionData } = parsedData;
-                const userAction = PlaneTrackerEvents_1.planeTrackerUserActionData.parse(actionData);
+                const userAction = PlaneTrackerEvents_1.wsUserActionData.parse(actionData);
                 return { ...userAction, type };
             }
             return parsedData;

package/esm/PlaneTrackerAPI.js

@@ -1,5 +1,5 @@
 import { z } from 'zod';
-import { blackListSchema, cameraSettingsSchema, flightInfoSchema, getIcaoSchema, mapInfoSchema, priorityListSchema, serverSettingsSchema, trackingModeSchema, typePriorityListSchema, whiteListSchema, wsAliasResponseSchema, zonesSchema, } from './types/PlaneTrackerAPI';
+import { blackListSchema, cameraSettingsSchema, flightInfoSchema, getIcaoSchema, mapInfoSchema, priorityListSchema, serverSettingsSchema, trackingModeSchema, whiteListSchema, wsAliasResponseSchema, zonesSchema, } from './types/PlaneTrackerAPI';
 import { CannotSetCoordsInAutoModeError, ImportSettingsError, InvalidAltitudeError, InvalidLatLngError, ResetCalibrationError, ServerError, BadRequestError, } from './errors/errors';
 import { BasicAPI } from './internal/BasicAPI';
 const BASE_PATH = '/local/planetracker';
@@ -118,31 +118,24 @@ export class PlaneTrackerAPI extends BasicAPI {
     }
     async getPriorityList(options) {
         const res = await this._getJson(`${BASE_PATH}/package/getPriorityList.cgi`, undefined, options);
-        return priorityListSchema.parse(res).priorityList;
+        return priorityListSchema.parse(res);
     }
     async setPriorityList(priorityList, options) {
-        await this._postJsonEncoded(`${BASE_PATH}/package/setPriorityList.cgi`, { priorityList }, this.apiUser, options);
-    }
-    async getTypePriorityList(options) {
-        const res = await this._getJson(`${BASE_PATH}/package/getTypePriorityList.cgi`, undefined, options);
-        return typePriorityListSchema.parse(res).typePriorityList;
-    }
-    async setTypePriorityList(typePriorityList, options) {
-        await this._postJsonEncoded(`${BASE_PATH}/package/setTypePriorityList.cgi`, { typePriorityList }, this.apiUser, options);
+        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).whiteList;
+        return whiteListSchema.parse(res);
     }
     async setWhiteList(whiteList, options) {
-        await this._postJsonEncoded(`${BASE_PATH}/package/setWhiteList.cgi`, { whiteList }, this.apiUser, options);
+        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).blackList;
+        return blackListSchema.parse(res);
     }
     async setBlackList(blackList, options) {
-        await this._postJsonEncoded(`${BASE_PATH}/package/setBlackList.cgi`, { blackList }, this.apiUser, options);
+        await this._postJsonEncoded(`${BASE_PATH}/package/setBlackList.cgi`, blackList, this.apiUser, options);
     }
     async fetchMapInfo(options) {
         const res = await this._getJson(`${BASE_PATH}/package/getMapInfo.cgi`, undefined, options);

package/esm/types/PlaneTrackerAPI.js

@@ -277,17 +277,24 @@ export const flightInfoSchema = z.object({
     }))
         .optional(),
 });
-export const typePriorityListSchema = z.object({
-    typePriorityList: z.array(z.string()).default([]),
+export const listEntryDomainSchema = z.enum(['adsb', 'remoteId']);
+export const listEntryIdTypeSchema = z.enum(['icao', 'type_icao', 'drone_mac', 'operator_mac', 'category']);
+export const listEntrySchema = z.object({
+    domain: listEntryDomainSchema,
+    idType: listEntryIdTypeSchema,
+    idValue: z.string().min(1),
 });
-export const priorityListSchema = z.object({
-    priorityList: z.array(z.string()).default([]),
+export const priorityListEntrySchema = listEntrySchema.extend({
+    priority: z.number().int().min(1),
 });
 export const whiteListSchema = z.object({
-    whiteList: z.array(z.string()).default([]),
+    list: z.array(listEntrySchema).default([]),
 });
 export const blackListSchema = z.object({
-    blackList: z.array(z.string()).default([]),
+    list: z.array(listEntrySchema).default([]),
+});
+export const priorityListSchema = z.object({
+    list: z.array(priorityListEntrySchema).default([]),
 });
 export const mapTypeSchema = z.enum(['roadmap', 'satellite']);
 export const mapInfoSchema = z.object({
@@ -316,3 +323,29 @@ export const zonesSchema = z.object({
     }))
         .default([]),
 });
+export const domainIdSchema = z.enum(['adsb', 'remoteId']);
+export const ADSB_CATEGORY_IDS = {
+    A_LIGHT: 'A_LIGHT',
+    A_SMALL: 'A_SMALL',
+    A_LARGE: 'A_LARGE',
+    A_HIGH_VORTEX: 'A_HIGH_VORTEX',
+    A_HEAVY: 'A_HEAVY',
+    A_HIGH_PERF: 'A_HIGH_PERF',
+    A_ROTORCRAFT: 'A_ROTORCRAFT',
+    B_GLIDER: 'B_GLIDER',
+    B_LIGHTER_THAN_AIR: 'B_LIGHTER_THAN_AIR',
+    B_PARACHUTIST: 'B_PARACHUTIST',
+    B_ULTRALIGHT: 'B_ULTRALIGHT',
+    B_UAV: 'B_UAV',
+    B_SPACE: 'B_SPACE',
+    C_SURFACE_EMERGENCY: 'C_SURFACE_EMERGENCY',
+    C_SERVICE_VEHICLE: 'C_SERVICE_VEHICLE',
+    C_POINT_OBSTACLE: 'C_POINT_OBSTACLE',
+    C_CLUSTER_OBSTACLE: 'C_CLUSTER_OBSTACLE',
+    C_LINE_OBSTACLE: 'C_LINE_OBSTACLE',
+    UNKNOWN: 'UNKNOWN',
+};
+export const REMOTE_ID_CATEGORY_IDS = {
+    DRONE: 'DRONE',
+    OPERATOR: 'OPERATOR',
+};

package/esm/types/ws/PlaneTrackerEvents.js

@@ -1,7 +1,11 @@
 import { z } from 'zod';
-import { trackingModeSchema, zonesSchema } from '../PlaneTrackerAPI';
-const apiFlightDataSchema = z.object({
+import { blackListSchema, priorityListSchema, trackingModeSchema, whiteListSchema, zonesSchema, domainIdSchema, } from '../PlaneTrackerAPI';
+const wsApiFlightDataSchema = z.object({
+    targetId: z.string(),
     icao: z.string(),
+    domain: domainIdSchema,
+    categoryId: z.string(),
+    groupId: z.string().optional(),
     lat: z.number(),
     lon: z.number(),
     heading: z.number(),
@@ -12,7 +16,6 @@ const apiFlightDataSchema = z.object({
     whiteListed: z.boolean(),
     blackListed: z.boolean(),
     priorityListed: z.boolean(),
-    typePriorityListed: z.boolean().default(false),
     autoSelectionIgnored: z.boolean(),
     signalQuality: z.number(),
     emitterCategorySet: z.number().default(4),
@@ -20,6 +23,13 @@ const apiFlightDataSchema = z.object({
     emergencyState: z.boolean(),
     emergencyStatusMessage: z.string(),
 });
+const wsCameraPositionDataSchema = z.object({
+    lat: z.number(),
+    lon: z.number(),
+    azimuth: z.number().min(0).max(360),
+    elevation: z.number().min(-90).max(90),
+    fov: z.number(),
+});
 const apiUserSchema = z.object({
     userId: z.string(),
     userName: z.string(),
@@ -31,78 +41,53 @@ const apiStringUserSchema = z.object({
     userName: z.string(),
     userPriority: z.string(),
 });
-export var PlaneTrackerWsEvents;
-(function (PlaneTrackerWsEvents) {
-    PlaneTrackerWsEvents["FLIGHT_LIST"] = "FLIGHT_LIST";
-    PlaneTrackerWsEvents["CAMERA_POSITION"] = "CAMERA_POSITION";
-    PlaneTrackerWsEvents["TRACKING_START"] = "TRACKING_START";
-    PlaneTrackerWsEvents["TRACKING_STOP"] = "TRACKING_STOP";
-    PlaneTrackerWsEvents["USER_ACTION"] = "USER_ACTION";
-    PlaneTrackerWsEvents["CONNECTED_USERS"] = "CONNECTED_USERS";
-    PlaneTrackerWsEvents["FORCE_TRACKING_STATUS"] = "FORCE_TRACKING_STATUS";
-})(PlaneTrackerWsEvents || (PlaneTrackerWsEvents = {}));
-export var PlaneTrackerUserActions;
-(function (PlaneTrackerUserActions) {
-    PlaneTrackerUserActions["TRACK_ICAO"] = "trackIcao.cgi";
-    PlaneTrackerUserActions["RESET_ICAO"] = "resetIcao.cgi";
-    PlaneTrackerUserActions["SET_PRIORITY_LIST"] = "setPriorityList.cgi";
-    PlaneTrackerUserActions["SET_TYPE_PRIORITY_LIST"] = "setTypePriorityList.cgi";
-    PlaneTrackerUserActions["SET_BLACK_LIST"] = "setBlackList.cgi";
-    PlaneTrackerUserActions["SET_WHITE_LIST"] = "setWhiteList.cgi";
-    PlaneTrackerUserActions["GO_TO_COORDINATES"] = "goToCoordinates.cgi";
-    PlaneTrackerUserActions["SET_TRACKING_MODE"] = "setTrackingMode.cgi";
-    PlaneTrackerUserActions["SET_ZONES"] = "setZones.cgi";
-    PlaneTrackerUserActions["RESET_PTZ_CALIBRATION"] = "resetPtzCalibration.cgi";
-    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),
+export var EUserActions;
+(function (EUserActions) {
+    EUserActions["TRACK_ICAO"] = "trackIcao.cgi";
+    EUserActions["RESET_ICAO"] = "resetIcao.cgi";
+    EUserActions["SET_PRIORITY_LIST"] = "setPriorityList.cgi";
+    EUserActions["SET_BLACK_LIST"] = "setBlackList.cgi";
+    EUserActions["SET_WHITE_LIST"] = "setWhiteList.cgi";
+    EUserActions["GO_TO_COORDINATES"] = "goToCoordinates.cgi";
+    EUserActions["SET_TRACKING_MODE"] = "setTrackingMode.cgi";
+    EUserActions["SET_ZONES"] = "setZones.cgi";
+    EUserActions["RESET_PTZ_CALIBRATION"] = "resetPtzCalibration.cgi";
+    EUserActions["LOCK_API"] = "lockApi.cgi";
+    EUserActions["UNLOCK_API"] = "unlockApi.cgi";
+})(EUserActions || (EUserActions = {}));
+export const wsUserActionData = z.discriminatedUnion('cgi', [
+    z.object({
+        cgi: z.literal(EUserActions.TRACK_ICAO),
         ip: z.string(),
         params: apiStringUserSchema.extend({
             icao: z.string(),
         }),
     }),
     z.object({
-        cgi: z.literal(PlaneTrackerUserActions.RESET_ICAO),
+        cgi: z.literal(EUserActions.RESET_ICAO),
         ip: z.string(),
         params: apiStringUserSchema,
     }),
     z.object({
-        cgi: z.literal(PlaneTrackerUserActions.SET_PRIORITY_LIST),
+        cgi: z.literal(EUserActions.SET_PRIORITY_LIST),
         ip: z.string(),
         params: apiStringUserSchema,
-        postJsonBody: z.object({
-            priorityList: z.array(z.string()),
-        }),
+        postJsonBody: priorityListSchema,
     }),
     z.object({
-        cgi: z.literal(PlaneTrackerUserActions.SET_TYPE_PRIORITY_LIST),
+        cgi: z.literal(EUserActions.SET_BLACK_LIST),
         ip: z.string(),
         params: apiStringUserSchema,
-        postJsonBody: z.object({
-            typePriorityList: z.array(z.string()),
-        }),
+        postJsonBody: blackListSchema,
     }),
     z.object({
-        cgi: z.literal(PlaneTrackerUserActions.SET_BLACK_LIST),
+        cgi: z.literal(EUserActions.SET_WHITE_LIST),
         ip: z.string(),
         params: apiStringUserSchema,
-        postJsonBody: z.object({
-            blackList: z.array(z.string()),
-        }),
+        postJsonBody: whiteListSchema,
     }),
     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),
+        cgi: z.literal(EUserActions.GO_TO_COORDINATES),
         ip: z.string(),
         params: apiStringUserSchema.extend({
             lat: z.string(),
@@ -110,44 +95,41 @@ export const planeTrackerUserActionData = z.discriminatedUnion('cgi', [
         }),
     }),
     z.object({
-        cgi: z.literal(PlaneTrackerUserActions.SET_TRACKING_MODE),
+        cgi: z.literal(EUserActions.SET_TRACKING_MODE),
         ip: z.string(),
         params: apiStringUserSchema,
         postJsonBody: trackingModeSchema,
     }),
     z.object({
-        cgi: z.literal(PlaneTrackerUserActions.SET_ZONES),
+        cgi: z.literal(EUserActions.SET_ZONES),
         ip: z.string(),
         params: apiStringUserSchema,
         postJsonBody: zonesSchema,
     }),
     z.object({
-        cgi: z.literal(PlaneTrackerUserActions.RESET_PTZ_CALIBRATION),
+        cgi: z.literal(EUserActions.RESET_PTZ_CALIBRATION),
         ip: z.string(),
         params: apiStringUserSchema,
     }),
     z.object({
-        cgi: z.literal(PlaneTrackerUserActions.LOCK_API),
+        cgi: z.literal(EUserActions.LOCK_API),
         ip: z.string(),
         params: apiStringUserSchema.extend({
             timeout: z.string(),
         }),
     }),
     z.object({
-        cgi: z.literal(PlaneTrackerUserActions.UNLOCK_API),
+        cgi: z.literal(EUserActions.UNLOCK_API),
         ip: z.string(),
         params: apiStringUserSchema,
     }),
 ]);
-const ptrEventsDataSchema = z.discriminatedUnion('type', [
-    z.object({
+const eventsDataSchema = z.discriminatedUnion('type', [
+    z
+        .object({
         type: z.literal('CAMERA_POSITION'),
-        lat: z.number(),
-        lon: z.number(),
-        azimuth: z.number().min(0).max(360),
-        elevation: z.number().min(-90).max(90),
-        fov: z.number(),
-    }),
+    })
+        .merge(wsCameraPositionDataSchema),
     z.object({
         type: z.literal('TRACKING_START'),
         icao: z.string(),
@@ -157,7 +139,7 @@ const ptrEventsDataSchema = z.discriminatedUnion('type', [
     }),
     z.object({
         type: z.literal('FLIGHT_LIST'),
-        list: z.array(apiFlightDataSchema),
+        list: z.array(wsApiFlightDataSchema),
     }),
     z.object({
         type: z.literal('USER_ACTION'),
@@ -168,18 +150,17 @@ const ptrEventsDataSchema = z.discriminatedUnion('type', [
             timeout: z.string().optional(),
         }),
         cgi: z.enum([
-            PlaneTrackerUserActions.TRACK_ICAO,
-            PlaneTrackerUserActions.RESET_ICAO,
-            PlaneTrackerUserActions.SET_PRIORITY_LIST,
-            PlaneTrackerUserActions.SET_TYPE_PRIORITY_LIST,
-            PlaneTrackerUserActions.SET_BLACK_LIST,
-            PlaneTrackerUserActions.SET_WHITE_LIST,
-            PlaneTrackerUserActions.GO_TO_COORDINATES,
-            PlaneTrackerUserActions.SET_TRACKING_MODE,
-            PlaneTrackerUserActions.SET_ZONES,
-            PlaneTrackerUserActions.RESET_PTZ_CALIBRATION,
-            PlaneTrackerUserActions.LOCK_API,
-            PlaneTrackerUserActions.UNLOCK_API,
+            EUserActions.TRACK_ICAO,
+            EUserActions.RESET_ICAO,
+            EUserActions.SET_PRIORITY_LIST,
+            EUserActions.SET_BLACK_LIST,
+            EUserActions.SET_WHITE_LIST,
+            EUserActions.GO_TO_COORDINATES,
+            EUserActions.SET_TRACKING_MODE,
+            EUserActions.SET_ZONES,
+            EUserActions.RESET_PTZ_CALIBRATION,
+            EUserActions.LOCK_API,
+            EUserActions.UNLOCK_API,
         ]),
         postJsonBody: z.any(),
     }),
@@ -199,6 +180,6 @@ const ptrEventsDataSchema = z.discriminatedUnion('type', [
     }),
 ]);
 export const ptrEventsSchema = z.discriminatedUnion('type', [
-    z.object({ type: z.literal('init'), data: ptrEventsDataSchema }),
-    ...ptrEventsDataSchema.options,
+    z.object({ type: z.literal('init'), data: eventsDataSchema }),
+    ...eventsDataSchema.options,
 ]);

package/esm/ws/PlaneTrackerEvents.js

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

package/package.json

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