camstreamerlib 4.0.33-dfd8bbb → 4.0.34-be26059

package/cjs/types/PlaneTrackerAPI.js

@@ -40,13 +40,59 @@ const labelOptionsSchema = zod_1.z.union([
     zod_1.z.literal('flight_number'),
     zod_1.z.literal('icao'),
 ]);
-const identificationLabelSchema = zod_1.z.object({
+const aircraftIdentificationLabelSchema = zod_1.z.object({
     firstRow: labelOptionsSchema,
     secondRow: labelOptionsSchema,
     thirdRow: labelOptionsSchema,
     fourthRow: labelOptionsSchema,
     opacity: zod_1.z.number().positive(),
 });
+const droneLabelOptionsSchema = zod_1.z.union([zod_1.z.literal('blank'), zod_1.z.literal('remote_id')]);
+const droneIdentificationLabelSchema = zod_1.z.object({
+    firstRow: droneLabelOptionsSchema,
+    opacity: zod_1.z.number().positive(),
+});
+const DEFAULT_DRONE_IDENTIFICATION_LABEL = {
+    firstRow: 'remote_id',
+    opacity: 30,
+};
+const identificationLabelSchema = zod_1.z.union([
+    zod_1.z.object({
+        aircraft: aircraftIdentificationLabelSchema,
+        drone: droneIdentificationLabelSchema.default(DEFAULT_DRONE_IDENTIFICATION_LABEL),
+    }),
+    aircraftIdentificationLabelSchema.transform((aircraft) => ({
+        aircraft,
+        drone: { ...DEFAULT_DRONE_IDENTIFICATION_LABEL },
+    })),
+]);
+const captureConfigSchema = zod_1.z.object({
+    defaultCaptureSizeMeters: zod_1.z.number().positive(),
+    captureSizeExtensionMeters: zod_1.z.number().positive(),
+});
+const DEFAULT_CAPTURE_CONFIG = {
+    defaultCaptureSizeMeters: 120,
+    captureSizeExtensionMeters: 80,
+};
+const cameraConfigSchema = zod_1.z.union([
+    zod_1.z.object({
+        aircraft: captureConfigSchema,
+        drone: captureConfigSchema.default(() => ({ ...DEFAULT_CAPTURE_CONFIG })),
+    }),
+    zod_1.z
+        .object({
+        defaultCaptureSizeMeters: zod_1.z.number().positive().default(DEFAULT_CAPTURE_CONFIG.defaultCaptureSizeMeters),
+        captureSizeExtensionMeters: zod_1.z
+            .number()
+            .positive()
+            .default(DEFAULT_CAPTURE_CONFIG.captureSizeExtensionMeters),
+    })
+        .strict()
+        .transform((captureConfig) => ({
+        aircraft: captureConfig,
+        drone: { ...captureConfig },
+    })),
+]);
 exports.cameraSettingsSchema = zod_1.z.object({
     units: zod_1.z.union([zod_1.z.literal('metric'), zod_1.z.literal('imperial')]).default('imperial'),
     adsbSource: zod_1.z
@@ -84,15 +130,10 @@ exports.cameraSettingsSchema = zod_1.z.object({
         nightSkyCalibrationFocusValue: 9000,
         focusCalibrationPoints: '',
     }),
-    cameraConfig: zod_1.z
-        .object({
-        defaultCaptureSizeMeters: zod_1.z.number().positive().default(120),
-        captureSizeExtensionMeters: zod_1.z.number().positive().default(80),
-    })
-        .default({
-        defaultCaptureSizeMeters: 120,
-        captureSizeExtensionMeters: 80,
-    }),
+    cameraConfig: cameraConfigSchema.default(() => ({
+        aircraft: { ...DEFAULT_CAPTURE_CONFIG },
+        drone: { ...DEFAULT_CAPTURE_CONFIG },
+    })),
     stream: zod_1.z
         .object({
         width: zod_1.z.number().positive(),
@@ -203,11 +244,14 @@ exports.cameraSettingsSchema = zod_1.z.object({
         port: 80,
     }),
     identificationLabel: identificationLabelSchema.default({
-        firstRow: 'registration',
-        secondRow: 'blank',
-        thirdRow: 'blank',
-        fourthRow: 'blank',
-        opacity: 30,
+        aircraft: {
+            firstRow: 'icao',
+            secondRow: 'call_sign',
+            thirdRow: 'blank',
+            fourthRow: 'blank',
+            opacity: 30,
+        },
+        drone: DEFAULT_DRONE_IDENTIFICATION_LABEL,
     }),
     acs: exports.connectionSchema
         .extend({

package/cjs/types/PlaneTrackerAPI.test.d.ts

@@ -0,0 +1 @@
+export {};

package/cjs/types/PlaneTrackerAPI.test.js

@@ -0,0 +1,90 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const PlaneTrackerAPI_1 = require("./PlaneTrackerAPI");
+const globals_1 = require("@jest/globals");
+const AIRCRAFT_LABEL = {
+    firstRow: 'icao',
+    secondRow: 'call_sign',
+    thirdRow: 'blank',
+    fourthRow: 'registration',
+    opacity: 50,
+};
+const DEFAULT_DRONE_LABEL = { firstRow: 'remote_id', opacity: 30 };
+(0, globals_1.describe)('cameraSettingsSchema identificationLabel', () => {
+    (0, globals_1.test)('defaults both aircraft and drone labels', () => {
+        (0, globals_1.expect)(PlaneTrackerAPI_1.cameraSettingsSchema.parse({}).identificationLabel).toEqual({
+            aircraft: {
+                firstRow: 'icao',
+                secondRow: 'call_sign',
+                thirdRow: 'blank',
+                fourthRow: 'blank',
+                opacity: 30,
+            },
+            drone: DEFAULT_DRONE_LABEL,
+        });
+    });
+    (0, globals_1.test)('parses the aircraft and drone label', () => {
+        const identificationLabel = { aircraft: AIRCRAFT_LABEL, drone: { firstRow: 'blank', opacity: 70 } };
+        (0, globals_1.expect)(PlaneTrackerAPI_1.cameraSettingsSchema.parse({ identificationLabel }).identificationLabel).toEqual(identificationLabel);
+    });
+    (0, globals_1.test)('defaults a missing drone label', () => {
+        (0, globals_1.expect)(PlaneTrackerAPI_1.cameraSettingsSchema.parse({ identificationLabel: { aircraft: AIRCRAFT_LABEL } }).identificationLabel).toEqual({ aircraft: AIRCRAFT_LABEL, drone: DEFAULT_DRONE_LABEL });
+    });
+    (0, globals_1.test)('converts the legacy flat label to the aircraft label', () => {
+        (0, globals_1.expect)(PlaneTrackerAPI_1.cameraSettingsSchema.parse({ identificationLabel: AIRCRAFT_LABEL }).identificationLabel).toEqual({
+            aircraft: AIRCRAFT_LABEL,
+            drone: DEFAULT_DRONE_LABEL,
+        });
+    });
+    (0, globals_1.test)('returns an independent drone label for each legacy parse', () => {
+        const first = PlaneTrackerAPI_1.cameraSettingsSchema.parse({ identificationLabel: AIRCRAFT_LABEL });
+        first.identificationLabel.drone.opacity = 90;
+        const second = PlaneTrackerAPI_1.cameraSettingsSchema.parse({ identificationLabel: AIRCRAFT_LABEL });
+        (0, globals_1.expect)(second.identificationLabel.drone).toEqual(DEFAULT_DRONE_LABEL);
+    });
+    (0, globals_1.test)('rejects an unknown drone label row', () => {
+        const identificationLabel = { aircraft: AIRCRAFT_LABEL, drone: { firstRow: 'icao', opacity: 30 } };
+        (0, globals_1.expect)(PlaneTrackerAPI_1.cameraSettingsSchema.safeParse({ identificationLabel }).success).toBe(false);
+    });
+});
+const CAPTURE_CONFIG = { defaultCaptureSizeMeters: 50, captureSizeExtensionMeters: 20 };
+const DEFAULT_CAPTURE_CONFIG = { defaultCaptureSizeMeters: 120, captureSizeExtensionMeters: 80 };
+(0, globals_1.describe)('cameraSettingsSchema cameraConfig', () => {
+    (0, globals_1.test)('defaults both aircraft and drone capture config', () => {
+        (0, globals_1.expect)(PlaneTrackerAPI_1.cameraSettingsSchema.parse({}).cameraConfig).toEqual({
+            aircraft: DEFAULT_CAPTURE_CONFIG,
+            drone: DEFAULT_CAPTURE_CONFIG,
+        });
+    });
+    (0, globals_1.test)('parses independent aircraft and drone capture config', () => {
+        const cameraConfig = {
+            aircraft: CAPTURE_CONFIG,
+            drone: { defaultCaptureSizeMeters: 5, captureSizeExtensionMeters: 3 },
+        };
+        (0, globals_1.expect)(PlaneTrackerAPI_1.cameraSettingsSchema.parse({ cameraConfig }).cameraConfig).toEqual(cameraConfig);
+    });
+    (0, globals_1.test)('defaults a missing drone capture config', () => {
+        (0, globals_1.expect)(PlaneTrackerAPI_1.cameraSettingsSchema.parse({ cameraConfig: { aircraft: CAPTURE_CONFIG } }).cameraConfig).toEqual({
+            aircraft: CAPTURE_CONFIG,
+            drone: DEFAULT_CAPTURE_CONFIG,
+        });
+    });
+    (0, globals_1.test)('copies the legacy flat capture config to both aircraft and drone', () => {
+        (0, globals_1.expect)(PlaneTrackerAPI_1.cameraSettingsSchema.parse({ cameraConfig: CAPTURE_CONFIG }).cameraConfig).toEqual({
+            aircraft: CAPTURE_CONFIG,
+            drone: CAPTURE_CONFIG,
+        });
+    });
+    (0, globals_1.test)('returns independent aircraft and drone objects', () => {
+        const legacy = PlaneTrackerAPI_1.cameraSettingsSchema.parse({ cameraConfig: CAPTURE_CONFIG }).cameraConfig;
+        legacy.drone.defaultCaptureSizeMeters = 1;
+        (0, globals_1.expect)(legacy.aircraft).toEqual(CAPTURE_CONFIG);
+        const first = PlaneTrackerAPI_1.cameraSettingsSchema.parse({}).cameraConfig;
+        first.drone.defaultCaptureSizeMeters = 1;
+        (0, globals_1.expect)(PlaneTrackerAPI_1.cameraSettingsSchema.parse({}).cameraConfig.drone).toEqual(DEFAULT_CAPTURE_CONFIG);
+    });
+    (0, globals_1.test)('rejects a non-positive drone capture size', () => {
+        const cameraConfig = { aircraft: CAPTURE_CONFIG, drone: { ...CAPTURE_CONFIG, defaultCaptureSizeMeters: 0 } };
+        (0, globals_1.expect)(PlaneTrackerAPI_1.cameraSettingsSchema.safeParse({ cameraConfig }).success).toBe(false);
+    });
+});

package/esm/CamOverlayAPI.js

@@ -26,13 +26,6 @@ export class CamOverlayAPI extends BasicAPI {
     async getMjpegStreamImage(mjpegUrl, options) {
         return await this._getBlob(`${BASE_PATH}/fetch_mjpeg_image.cgi`, { mjpeg_url: decodeURIComponent(mjpegUrl) }, options);
     }
-    async isViewerPassValid(pass, options) {
-        const res = await this._getJson(`${BASE_PATH}/check_pass.cgi`, { pass }, options);
-        if (res.status !== 200) {
-            throw new Error(res.message);
-        }
-        return res.data === '1';
-    }
     async listFiles(fileType, options) {
         const res = await this._getJson(`${BASE_PATH}/upload_${fileType}.cgi`, { action: 'list' }, options);
         return getFileListSchema(fileType).parse(res.list);

package/esm/VapixAPI.js

@@ -90,7 +90,7 @@ export class VapixAPI extends BasicAPI {
             };
             await this._postJsonEncoded('/axis-cgi/opticscontrol.cgi', data, undefined, options);
         }
-        catch (err) {
+        catch {
             await this._postUrlEncoded('/axis-cgi/opticssetup.cgi', {
                 autofocus: 'perform',
                 source: '1',

package/esm/helpers.js

@@ -10,7 +10,7 @@ export const jsonParseCameraParam = (param, paramName) => {
         try {
             return JSON.parse(decodeURIComponent(param.replaceAll('\\', '')));
         }
-        catch (e) {
+        catch {
             throw new JsonParseError(paramName, param);
         }
     }

package/esm/node/HttpRequestSender.js

@@ -1,5 +1,5 @@
 import { Digest } from './Digest';
-import { Agent, fetch as undiciFetch, Request as UndiciRequest, } from 'undici';
+import { Agent, fetch as undiciFetch } from 'undici';
 export class HttpRequestSender {
     agent;
     authData;
@@ -29,12 +29,15 @@ export class HttpRequestSender {
             options.headers ??= {};
             options.headers['Authorization'] = authorization;
         }
-        const req = new UndiciRequest(url, { body: postData, method: options.method, headers: options.headers });
-        const res = await undiciFetch(req, { signal: AbortSignal.timeout(options.timeout), dispatcher: this.agent });
-        if (!res.ok) {
-            this.invalidateAuthorization();
-        }
+        const res = await undiciFetch(url, {
+            method: options.method,
+            headers: options.headers,
+            body: postData,
+            signal: AbortSignal.timeout(options.timeout),
+            dispatcher: this.agent,
+        });
         if (res.status === 401) {
+            this.invalidateAuthorization();
             const authenticateHeader = res.headers.get('www-authenticate');
             if (authenticateHeader !== null &&
                 authenticateHeader.indexOf('Digest') !== -1 &&

package/esm/node/HttpRequestSender.test.js

@@ -0,0 +1,136 @@
+import * as http from 'http';
+import { FormData } from 'undici';
+import { describe, test, expect, beforeEach, afterEach } from '@jest/globals';
+import { HttpRequestSender } from './HttpRequestSender';
+const DIGEST_CHALLENGE = 'Digest realm="test", qop="auth", nonce="abc123", opaque="xyz"';
+const okHandler = (_req, res) => {
+    res.end('ok');
+};
+const digestHandler = (req, res) => {
+    if (req.headers.authorization?.startsWith('Digest ') !== true) {
+        res.writeHead(401, { 'WWW-Authenticate': DIGEST_CHALLENGE });
+        res.end();
+        return;
+    }
+    res.end('ok');
+};
+describe('HttpRequestSender', () => {
+    let server;
+    let received;
+    let handler;
+    const options = (overrides = {}) => ({
+        protocol: 'http:',
+        host: '127.0.0.1',
+        port: server.address().port,
+        path: '/test.cgi',
+        user: 'root',
+        pass: 'pass',
+        ...overrides,
+    });
+    beforeEach(async () => {
+        received = [];
+        handler = okHandler;
+        server = http.createServer((req, res) => {
+            let body = '';
+            req.on('data', (chunk) => {
+                body += chunk.toString();
+            });
+            req.on('end', () => {
+                received.push({
+                    method: req.method,
+                    url: req.url,
+                    authorization: req.headers.authorization,
+                    contentType: req.headers['content-type'],
+                    body,
+                });
+                handler(req, res);
+            });
+        });
+        await new Promise((resolve) => {
+            server.listen(0, '127.0.0.1', resolve);
+        });
+    });
+    afterEach(async () => {
+        server.closeAllConnections();
+        await new Promise((resolve) => {
+            server.close(() => resolve());
+        });
+    });
+    test('sends basic auth when the server accepts it', async () => {
+        const res = await new HttpRequestSender().sendRequest(options());
+        expect(res.status).toBe(200);
+        expect(await res.text()).toBe('ok');
+        expect(received).toHaveLength(1);
+        expect(received[0]?.authorization).toBe(`Basic ${Buffer.from('root:pass').toString('base64')}`);
+    });
+    test('sends no authorization without credentials', async () => {
+        await new HttpRequestSender().sendRequest(options({ user: undefined, pass: undefined }));
+        expect(received[0]?.authorization).toBeUndefined();
+    });
+    test('retries with digest auth on a digest 401 and reuses it for later requests', async () => {
+        handler = digestHandler;
+        const sender = new HttpRequestSender();
+        const first = await sender.sendRequest(options());
+        const second = await sender.sendRequest(options());
+        expect(first.status).toBe(200);
+        expect(second.status).toBe(200);
+        expect(received.map((r) => r.authorization?.split(' ')[0])).toEqual(['Basic', 'Digest', 'Digest']);
+    });
+    test('keeps digest auth after a non-401 error response', async () => {
+        const sender = new HttpRequestSender();
+        handler = digestHandler;
+        await sender.sendRequest(options());
+        handler = (_req, res) => {
+            res.writeHead(500);
+            res.end();
+        };
+        await sender.sendRequest(options());
+        handler = digestHandler;
+        const res = await sender.sendRequest(options());
+        expect(res.status).toBe(200);
+        expect(received.map((r) => r.authorization?.split(' ')[0])).toEqual(['Basic', 'Digest', 'Digest', 'Digest']);
+    });
+    test('retries a digest 401 only once', async () => {
+        handler = (_req, res) => {
+            res.writeHead(401, { 'WWW-Authenticate': DIGEST_CHALLENGE });
+            res.end();
+        };
+        const res = await new HttpRequestSender().sendRequest(options());
+        expect(res.status).toBe(401);
+        expect(received).toHaveLength(2);
+    });
+    test('rejects when the response does not arrive within the timeout', async () => {
+        handler = () => undefined;
+        await expect(new HttpRequestSender().sendRequest(options({ timeout: 200 }))).rejects.toThrow();
+    });
+    test('sends a url-encoded POST body', async () => {
+        const res = await new HttpRequestSender().sendRequest(options({ method: 'POST', headers: { 'Content-Type': 'application/x-www-form-urlencoded' } }), 'action=settext&text=hello');
+        expect(res.ok).toBe(true);
+        expect(received[0]).toMatchObject({
+            method: 'POST',
+            contentType: 'application/x-www-form-urlencoded',
+            body: 'action=settext&text=hello',
+        });
+    });
+    test('sends a JSON POST body', async () => {
+        const payload = JSON.stringify({ text: 'hello', index: 1 });
+        await new HttpRequestSender().sendRequest(options({ method: 'POST', headers: { 'Content-Type': 'application/json' } }), payload);
+        expect(received[0]).toMatchObject({ method: 'POST', contentType: 'application/json', body: payload });
+    });
+    test('sends a Buffer POST body', async () => {
+        await new HttpRequestSender().sendRequest(options({ method: 'POST' }), Buffer.from('binary-data'));
+        expect(received[0]?.body).toBe('binary-data');
+    });
+    test('sends a FormData POST body as multipart', async () => {
+        const formData = new FormData();
+        formData.append('field', 'value');
+        await new HttpRequestSender().sendRequest(options({ method: 'POST' }), formData);
+        expect(received[0]?.contentType).toMatch(/^multipart\/form-data; boundary=/);
+        expect(received[0]?.body).toContain('value');
+    });
+    test('resends the POST body on the digest retry', async () => {
+        handler = digestHandler;
+        await new HttpRequestSender().sendRequest(options({ method: 'POST' }), 'payload');
+        expect(received.map((r) => r.body)).toEqual(['payload', 'payload']);
+    });
+});

package/esm/types/PlaneTrackerAPI.js

@@ -37,13 +37,59 @@ const labelOptionsSchema = z.union([
     z.literal('flight_number'),
     z.literal('icao'),
 ]);
-const identificationLabelSchema = z.object({
+const aircraftIdentificationLabelSchema = z.object({
     firstRow: labelOptionsSchema,
     secondRow: labelOptionsSchema,
     thirdRow: labelOptionsSchema,
     fourthRow: labelOptionsSchema,
     opacity: z.number().positive(),
 });
+const droneLabelOptionsSchema = z.union([z.literal('blank'), z.literal('remote_id')]);
+const droneIdentificationLabelSchema = z.object({
+    firstRow: droneLabelOptionsSchema,
+    opacity: z.number().positive(),
+});
+const DEFAULT_DRONE_IDENTIFICATION_LABEL = {
+    firstRow: 'remote_id',
+    opacity: 30,
+};
+const identificationLabelSchema = z.union([
+    z.object({
+        aircraft: aircraftIdentificationLabelSchema,
+        drone: droneIdentificationLabelSchema.default(DEFAULT_DRONE_IDENTIFICATION_LABEL),
+    }),
+    aircraftIdentificationLabelSchema.transform((aircraft) => ({
+        aircraft,
+        drone: { ...DEFAULT_DRONE_IDENTIFICATION_LABEL },
+    })),
+]);
+const captureConfigSchema = z.object({
+    defaultCaptureSizeMeters: z.number().positive(),
+    captureSizeExtensionMeters: z.number().positive(),
+});
+const DEFAULT_CAPTURE_CONFIG = {
+    defaultCaptureSizeMeters: 120,
+    captureSizeExtensionMeters: 80,
+};
+const cameraConfigSchema = z.union([
+    z.object({
+        aircraft: captureConfigSchema,
+        drone: captureConfigSchema.default(() => ({ ...DEFAULT_CAPTURE_CONFIG })),
+    }),
+    z
+        .object({
+        defaultCaptureSizeMeters: z.number().positive().default(DEFAULT_CAPTURE_CONFIG.defaultCaptureSizeMeters),
+        captureSizeExtensionMeters: z
+            .number()
+            .positive()
+            .default(DEFAULT_CAPTURE_CONFIG.captureSizeExtensionMeters),
+    })
+        .strict()
+        .transform((captureConfig) => ({
+        aircraft: captureConfig,
+        drone: { ...captureConfig },
+    })),
+]);
 export const cameraSettingsSchema = z.object({
     units: z.union([z.literal('metric'), z.literal('imperial')]).default('imperial'),
     adsbSource: z
@@ -81,15 +127,10 @@ export const cameraSettingsSchema = z.object({
         nightSkyCalibrationFocusValue: 9000,
         focusCalibrationPoints: '',
     }),
-    cameraConfig: z
-        .object({
-        defaultCaptureSizeMeters: z.number().positive().default(120),
-        captureSizeExtensionMeters: z.number().positive().default(80),
-    })
-        .default({
-        defaultCaptureSizeMeters: 120,
-        captureSizeExtensionMeters: 80,
-    }),
+    cameraConfig: cameraConfigSchema.default(() => ({
+        aircraft: { ...DEFAULT_CAPTURE_CONFIG },
+        drone: { ...DEFAULT_CAPTURE_CONFIG },
+    })),
     stream: z
         .object({
         width: z.number().positive(),
@@ -200,11 +241,14 @@ export const cameraSettingsSchema = z.object({
         port: 80,
     }),
     identificationLabel: identificationLabelSchema.default({
-        firstRow: 'registration',
-        secondRow: 'blank',
-        thirdRow: 'blank',
-        fourthRow: 'blank',
-        opacity: 30,
+        aircraft: {
+            firstRow: 'icao',
+            secondRow: 'call_sign',
+            thirdRow: 'blank',
+            fourthRow: 'blank',
+            opacity: 30,
+        },
+        drone: DEFAULT_DRONE_IDENTIFICATION_LABEL,
     }),
     acs: connectionSchema
         .extend({

package/esm/types/PlaneTrackerAPI.test.js

@@ -0,0 +1,88 @@
+import { cameraSettingsSchema } from './PlaneTrackerAPI';
+import { describe, test, expect } from '@jest/globals';
+const AIRCRAFT_LABEL = {
+    firstRow: 'icao',
+    secondRow: 'call_sign',
+    thirdRow: 'blank',
+    fourthRow: 'registration',
+    opacity: 50,
+};
+const DEFAULT_DRONE_LABEL = { firstRow: 'remote_id', opacity: 30 };
+describe('cameraSettingsSchema identificationLabel', () => {
+    test('defaults both aircraft and drone labels', () => {
+        expect(cameraSettingsSchema.parse({}).identificationLabel).toEqual({
+            aircraft: {
+                firstRow: 'icao',
+                secondRow: 'call_sign',
+                thirdRow: 'blank',
+                fourthRow: 'blank',
+                opacity: 30,
+            },
+            drone: DEFAULT_DRONE_LABEL,
+        });
+    });
+    test('parses the aircraft and drone label', () => {
+        const identificationLabel = { aircraft: AIRCRAFT_LABEL, drone: { firstRow: 'blank', opacity: 70 } };
+        expect(cameraSettingsSchema.parse({ identificationLabel }).identificationLabel).toEqual(identificationLabel);
+    });
+    test('defaults a missing drone label', () => {
+        expect(cameraSettingsSchema.parse({ identificationLabel: { aircraft: AIRCRAFT_LABEL } }).identificationLabel).toEqual({ aircraft: AIRCRAFT_LABEL, drone: DEFAULT_DRONE_LABEL });
+    });
+    test('converts the legacy flat label to the aircraft label', () => {
+        expect(cameraSettingsSchema.parse({ identificationLabel: AIRCRAFT_LABEL }).identificationLabel).toEqual({
+            aircraft: AIRCRAFT_LABEL,
+            drone: DEFAULT_DRONE_LABEL,
+        });
+    });
+    test('returns an independent drone label for each legacy parse', () => {
+        const first = cameraSettingsSchema.parse({ identificationLabel: AIRCRAFT_LABEL });
+        first.identificationLabel.drone.opacity = 90;
+        const second = cameraSettingsSchema.parse({ identificationLabel: AIRCRAFT_LABEL });
+        expect(second.identificationLabel.drone).toEqual(DEFAULT_DRONE_LABEL);
+    });
+    test('rejects an unknown drone label row', () => {
+        const identificationLabel = { aircraft: AIRCRAFT_LABEL, drone: { firstRow: 'icao', opacity: 30 } };
+        expect(cameraSettingsSchema.safeParse({ identificationLabel }).success).toBe(false);
+    });
+});
+const CAPTURE_CONFIG = { defaultCaptureSizeMeters: 50, captureSizeExtensionMeters: 20 };
+const DEFAULT_CAPTURE_CONFIG = { defaultCaptureSizeMeters: 120, captureSizeExtensionMeters: 80 };
+describe('cameraSettingsSchema cameraConfig', () => {
+    test('defaults both aircraft and drone capture config', () => {
+        expect(cameraSettingsSchema.parse({}).cameraConfig).toEqual({
+            aircraft: DEFAULT_CAPTURE_CONFIG,
+            drone: DEFAULT_CAPTURE_CONFIG,
+        });
+    });
+    test('parses independent aircraft and drone capture config', () => {
+        const cameraConfig = {
+            aircraft: CAPTURE_CONFIG,
+            drone: { defaultCaptureSizeMeters: 5, captureSizeExtensionMeters: 3 },
+        };
+        expect(cameraSettingsSchema.parse({ cameraConfig }).cameraConfig).toEqual(cameraConfig);
+    });
+    test('defaults a missing drone capture config', () => {
+        expect(cameraSettingsSchema.parse({ cameraConfig: { aircraft: CAPTURE_CONFIG } }).cameraConfig).toEqual({
+            aircraft: CAPTURE_CONFIG,
+            drone: DEFAULT_CAPTURE_CONFIG,
+        });
+    });
+    test('copies the legacy flat capture config to both aircraft and drone', () => {
+        expect(cameraSettingsSchema.parse({ cameraConfig: CAPTURE_CONFIG }).cameraConfig).toEqual({
+            aircraft: CAPTURE_CONFIG,
+            drone: CAPTURE_CONFIG,
+        });
+    });
+    test('returns independent aircraft and drone objects', () => {
+        const legacy = cameraSettingsSchema.parse({ cameraConfig: CAPTURE_CONFIG }).cameraConfig;
+        legacy.drone.defaultCaptureSizeMeters = 1;
+        expect(legacy.aircraft).toEqual(CAPTURE_CONFIG);
+        const first = cameraSettingsSchema.parse({}).cameraConfig;
+        first.drone.defaultCaptureSizeMeters = 1;
+        expect(cameraSettingsSchema.parse({}).cameraConfig.drone).toEqual(DEFAULT_CAPTURE_CONFIG);
+    });
+    test('rejects a non-positive drone capture size', () => {
+        const cameraConfig = { aircraft: CAPTURE_CONFIG, drone: { ...CAPTURE_CONFIG, defaultCaptureSizeMeters: 0 } };
+        expect(cameraSettingsSchema.safeParse({ cameraConfig }).success).toBe(false);
+    });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "camstreamerlib",
-  "version": "4.0.33-dfd8bbb",
+  "version": "4.0.34-be26059",
   "description": "Helper library for CamStreamer ACAP applications.",
   "prettier": "@camstreamer/prettier-config",
   "engine": {
@@ -11,7 +11,7 @@
     "eventemitter2": "^5.0.1",
     "fast-xml-parser": "^5.3.6",
     "type-fest": "^4.41.0",
-    "undici": "^6.28.0",
+    "undici": "^6.28.1",
     "ws": "^8.18.0",
     "zod": "^3.25.76"
   },
@@ -19,25 +19,28 @@
     "@camstreamer/eslint-config": "^1.0.2",
     "@camstreamer/prettier-config": "^2.0.4",
     "@types/adm-zip": "^0.5.5",
-    "@types/jest": "^28.0.0",
+    "@types/jest": "^30.0.0",
     "@types/node": "^18.19.127",
     "@types/ws": "^8.5.10",
-    "@typescript-eslint/eslint-plugin": "^6.8.0",
-    "@typescript-eslint/parser": "^6.8.0",
+    "@typescript-eslint/eslint-plugin": "^8.71.1",
+    "@typescript-eslint/parser": "^8.71.1",
     "esbuild": "^0.28.2",
     "eslint": "^8.51.0",
     "eslint-plugin-deprecation": "^2.0.0",
-    "eslint-plugin-unused-imports": "^3.0.0",
-    "jest": "^28.1.3",
+    "eslint-plugin-unused-imports": "^4.4.1",
+    "jest": "^30.5.2",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.7.1",
-    "ts-jest": "^28.0.0",
+    "ts-jest": "^29.4.14",
     "ts-node": "^10.7.0",
     "typescript": "5.3.3"
   },
   "overrides": {
     "js-yaml": "^4.3.2",
-    "browserslist": "^4.28.7"
+    "browserslist": "^4.28.7",
+    "eslint-plugin-deprecation": {
+      "@typescript-eslint/utils": "^8.71.1"
+    }
   },
   "scripts": {
     "clean": "rimraf dist/*",

package/types/CamOverlayAPI.d.ts

@@ -14,7 +14,6 @@ export declare class CamOverlayAPI<Client extends IClient<TResponse, any>> exten
     }[]>;
     wsAuthorization(options?: THttpRequestOptions): Promise<string>;
     getMjpegStreamImage(mjpegUrl: string, options?: THttpRequestOptions): Promise<ReturnType<Awaited<ReturnType<Client["get"]>>["blob"]>>;
-    isViewerPassValid(pass: string, options?: THttpRequestOptions): Promise<boolean>;
     listFiles<T extends TFileType>(fileType: T, options?: THttpRequestOptions): Promise<TFileList<T>>;
     uploadFile<T extends TFileType>(fileType: T, formData: Parameters<Client['post']>[0]['data'], storage: TFileStorageType<T>, options?: THttpRequestOptions): Promise<void>;
     removeFile<T extends TFileType>(fileType: T, fileParams: TFile<T>, options?: THttpRequestOptions): Promise<void>;