camstreamerlib 4.0.34 → 4.0.35-38dd1fb

package/esm/CamSwitcherAPI.js

@@ -153,6 +153,7 @@ export class CamSwitcherAPI extends BasicAPI {
             audio: {
                 sampleRate: data.audioSampleRate,
                 channelCount: data.audioChannelCount,
+                bitrate: data.audioBitrate,
             },
             keyboard: data.keyboard,
         };
@@ -204,6 +205,7 @@ export class CamSwitcherAPI extends BasicAPI {
         const settings = {
             audioSampleRate: saveData.audio?.sampleRate,
             audioChannelCount: saveData.audio?.channelCount,
+            audioBitrate: saveData.audio?.bitrate,
             keyboard: saveData.keyboard,
             fps: saveData.video.fps,
             resolution: saveData.video.resolution,

package/esm/PlaneTrackerAPI.js

@@ -1,6 +1,7 @@
 import { z } from 'zod';
-import { blackListSchema, cameraSettingsSchema, domainListSchema, flightInfoSchema, getIcaoSchema, mapInfoSchema, milestoneCameraListSchema, priorityListSchema, serverSettingsSchema, trackingModeSchema, whiteListSchema, wsAliasResponseSchema, zonesSchema, } from './types/PlaneTrackerAPI';
+import { blackListSchema, cameraSettingsSchema, domainListSchema, flightInfoSchema, getIcaoSchema, mapInfoSchema, milestoneCameraListSchema, priorityListSchema, serverSettingsSchema, trackingModeSchema, whiteListSchema, zonesSchema, } from './types/PlaneTrackerAPI';
 import { CannotSetCoordsInAutoModeError, ImportSettingsError, InvalidAltitudeError, InvalidLatLngError, ResetCalibrationError, ServerError, BadRequestError, } from './errors/errors';
+import { wsAliasResponseSchema } from './types/common';
 import { BasicAPI } from './internal/BasicAPI';
 import { apiUserInputSchema } from './types/ws/PlaneTrackerEvents';
 const BASE_PATH = '/local/planetracker';

package/esm/VapixAPI.js

@@ -90,7 +90,9 @@ export class VapixAPI extends BasicAPI {
             };
             await this._postJsonEncoded('/axis-cgi/opticscontrol.cgi', data, undefined, options);
         }
-        catch {
+        catch (error) {
+            console.warn('Failed to perform autofocus: ', error instanceof Error ? error.message : String(error));
+            console.warn('Falling back to deprecated optics setup API');
             await this._postUrlEncoded('/axis-cgi/opticssetup.cgi', {
                 autofocus: 'perform',
                 source: '1',
@@ -141,7 +143,7 @@ export class VapixAPI extends BasicAPI {
             return data.data.activeTimeZone;
         }
         catch (error) {
-            console.warn('Failed to fetch time zone data from time API v2:', error instanceof Error ? error.message : JSON.stringify(error));
+            console.warn('Failed to fetch time zone data from time API v2:', error instanceof Error ? error.message : String(error));
             console.warn('Falling back to deprecated time API v1');
         }
         try {

package/esm/errors/errors.js

@@ -20,7 +20,7 @@ export class ServiceNotFoundError extends Error {
 }
 export class ParsingBlobError extends Error {
     constructor(err) {
-        super('Error parsing response as Blob: ' + err);
+        super('Error parsing response as Blob: ' + String(err));
         this.name = 'ParsingBlobError';
     }
 }
@@ -84,7 +84,7 @@ export class NoDeviceInfoError extends Error {
 }
 export class FetchDeviceInfoError extends Error {
     constructor(err) {
-        super('Error fetching remote camera data: ' + err);
+        super('Error fetching remote camera data: ' + String(err));
         this.name = 'NoDeviceInfoFromCameraError';
     }
 }
@@ -108,7 +108,7 @@ export class PtzNotSupportedError extends Error {
 }
 export class StorageDataFetchError extends Error {
     constructor(err) {
-        super('Error fetching storage data: ' + err);
+        super('Error fetching storage data: ' + String(err));
         this.name = 'StorageDataFetchError';
     }
 }
@@ -132,7 +132,7 @@ export class TimezoneNotSetupError extends Error {
 }
 export class TimezoneFetchError extends Error {
     constructor(err) {
-        super('Error fetching time zone information: ' + err);
+        super('Error fetching time zone information: ' + String(err));
         this.name = 'TimezoneFetchError';
     }
 }

package/esm/types/CamSwitcherAPI.js

@@ -142,6 +142,7 @@ export const cameraOptionsSchema = bitrateVapixParamsSchema
     bitrateVapixParams: z.string().nullable(),
     audioSampleRate: z.number(),
     audioChannelCount: audioChannelCountSchema,
+    audioBitrate: z.number().int().nonnegative(),
     keyboard: z.object({
         fromSource: keyboardShortcutSchema,
         none: keyboardShortcutSchema,

package/esm/types/PlaneTrackerAPI.js

@@ -1,9 +1,4 @@
 import { z } from 'zod';
-export const wsAliasResponseSchema = z.object({
-    alias: z.string(),
-    ws: z.string(),
-    ws_initial_message: z.string(),
-});
 export const connectionSchema = z.object({
     protocol: z.union([z.literal('http'), z.literal('https'), z.literal('https_insecure')]),
     ip: z.union([z.string().ip(), z.literal('')]),
@@ -37,13 +32,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(),
+    opacity: z.number().nonnegative(),
+});
+const droneLabelOptionsSchema = z.union([z.literal('blank'), z.literal('remote_id')]);
+const droneIdentificationLabelSchema = z.object({
+    firstRow: droneLabelOptionsSchema,
+    opacity: z.number().nonnegative(),
+});
+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 +122,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 +236,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/esm/types/common.js

@@ -12,6 +12,11 @@ export const networkCameraListSchema = z.array(z.object({
 }));
 export const keyboardShortcutSchema = z.string().nullable();
 export const keyboardShortcutsSchema = z.record(keyboardShortcutSchema);
+export const wsAliasResponseSchema = z.object({
+    alias: z.string(),
+    ws: z.string(),
+    ws_initial_message: z.string(),
+});
 export const bitrateModeSchema = z.union([z.literal('VBR'), z.literal('MBR'), z.literal('ABR')]);
 export const bitrateVapixParamsSchema = z.object({
     bitrateMode: bitrateModeSchema,

package/package.json

@@ -1,117 +1,114 @@
 {
-    "name": "camstreamerlib",
-    "version": "4.0.34",
-    "description": "Helper library for CamStreamer ACAP applications.",
-    "prettier": "@camstreamer/prettier-config",
-    "engine": {
-        "node": ">=18.0.0"
+  "name": "camstreamerlib",
+  "version": "4.0.35-38dd1fb",
+  "description": "Helper library for CamStreamer ACAP applications.",
+  "prettier": "@camstreamer/prettier-config",
+  "engine": {
+    "node": ">=18.0.0"
+  },
+  "dependencies": {
+    "adm-zip": "^0.6.0",
+    "eventemitter2": "^5.0.1",
+    "fast-xml-parser": "^5.3.6",
+    "type-fest": "^4.41.0",
+    "undici": "^6.28.1",
+    "ws": "^8.18.0",
+    "zod": "^3.25.76"
+  },
+  "devDependencies": {
+    "@camstreamer/eslint-config": "^1.0.10",
+    "@camstreamer/prettier-config": "^2.0.4",
+    "@eslint/js": "^10.0.1",
+    "@types/adm-zip": "^0.5.5",
+    "@types/jest": "^30.0.0",
+    "@types/node": "^18.19.127",
+    "@types/ws": "^8.5.10",
+    "esbuild": "^0.28.2",
+    "eslint": "^10.12.0",
+    "eslint-plugin-unused-imports": "^4.4.1",
+    "globals": "^17.13.0",
+    "jest": "^30.5.2",
+    "npm-run-all": "^4.1.5",
+    "prettier": "^2.7.1",
+    "ts-jest": "^29.4.14",
+    "ts-node": "^10.7.0",
+    "typescript": "5.3.3",
+    "typescript-eslint": "^8.71.2"
+  },
+  "overrides": {
+    "js-yaml": "^4.3.2",
+    "browserslist": "^4.28.7"
+  },
+  "scripts": {
+    "clean": "node -e \"require('fs').rmSync('dist', { recursive: true, force: true })\"",
+    "build": "npm-run-all clean build:cjs build:esm copyPackage",
+    "build:cjs": "tsc --project tsconfig.cjs.json",
+    "build:esm": "tsc --project tsconfig.esm.json",
+    "build:browser": "esbuild src/browser.index.ts --bundle --format=esm --platform=browser --target=es2022 --outfile=examples/camstreamerlib.js",
+    "copyPackage": "cp -f LICENSE dist/ && cp -f README.md dist/ && cp -f package.json dist/ && cp -r -f examples dist/",
+    "publishPackage": "./publish.sh",
+    "lint": "eslint \"src/**/*.ts\"",
+    "lint:fix": "eslint \"src/**/*.ts\" --fix",
+    "pretty": "prettier --write \"./{{src,doc}/**/*.{ts,tsx,md},README.md}\"",
+    "pretty:check": "prettier --check \"./{{src,doc}/**/*.{ts,tsx,md},README.md}\"",
+    "test": "node --experimental-vm-modules node_modules/jest/bin/jest.js",
+    "audit": "npm audit --audit-level=high"
+  },
+  "files": [
+    "/**/*.js",
+    "/**/*.ts",
+    "/examples/**/*"
+  ],
+  "main": "./cjs/index.js",
+  "module": "./esm/index.js",
+  "types": "types/index.d.ts",
+  "exports": {
+    ".": {
+      "import": "./esm/index.js",
+      "require": "./cjs/index.js",
+      "types": "./types/index.d.ts"
     },
-    "dependencies": {
-        "adm-zip": "^0.6.0",
-        "eventemitter2": "^5.0.1",
-        "fast-xml-parser": "^5.3.6",
-        "type-fest": "^4.41.0",
-        "undici": "^6.28.1",
-        "ws": "^8.18.0",
-        "zod": "^3.25.76"
+    "./web": {
+      "import": "./esm/web/index.js",
+      "require": "./cjs/web/index.js",
+      "types": "./types/web/index.d.ts"
     },
-    "devDependencies": {
-        "@camstreamer/eslint-config": "^1.0.2",
-        "@camstreamer/prettier-config": "^2.0.4",
-        "@types/adm-zip": "^0.5.5",
-        "@types/jest": "^30.0.0",
-        "@types/node": "^18.19.127",
-        "@types/ws": "^8.5.10",
-        "@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": "^4.4.1",
-        "jest": "^30.5.2",
-        "npm-run-all": "^4.1.5",
-        "prettier": "^2.7.1",
-        "ts-jest": "^29.4.14",
-        "ts-node": "^10.7.0",
-        "typescript": "5.3.3"
+    "./node": {
+      "import": "./esm/node/index.js",
+      "require": "./cjs/node/index.js",
+      "types": "./types/node/index.d.ts"
     },
-    "overrides": {
-        "js-yaml": "^4.3.2",
-        "browserslist": "^4.28.7",
-        "eslint-plugin-deprecation": {
-            "@typescript-eslint/utils": "^8.71.1"
-        }
+    "./cjs/index": {
+      "import": "./esm/index.js",
+      "require": "./cjs/index.js",
+      "types": "./types/index.d.ts"
     },
-    "scripts": {
-        "clean": "rimraf dist/*",
-        "build": "npm-run-all clean build:cjs build:esm copyPackage",
-        "build:cjs": "tsc --project tsconfig.cjs.json",
-        "build:esm": "tsc --project tsconfig.esm.json",
-        "build:browser": "esbuild src/browser.index.ts --bundle --format=esm --platform=browser --target=es2022 --outfile=examples/camstreamerlib.js",
-        "copyPackage": "cp -f LICENSE dist/ && cp -f README.md dist/ && cp -f package.json dist/ && cp -r -f examples dist/",
-        "publishPackage": "./publish.sh",
-        "lint": "eslint \"src/**/*.ts\"",
-        "lint:fix": "eslint \"src/**/*.ts\" --fix",
-        "pretty": "prettier --write \"./{{src,doc}/**/*.{ts,tsx,md},README.md}\"",
-        "pretty:check": "prettier --check \"./{{src,doc}/**/*.{ts,tsx,md},README.md}\"",
-        "test": "node --experimental-vm-modules node_modules/jest/bin/jest.js",
-        "audit": "npm audit --audit-level=high"
+    "./cjs/node": {
+      "import": "./esm/node/index.js",
+      "require": "./cjs/node/index.js",
+      "types": "./types/node/index.js"
     },
-    "files": [
-        "/**/*.js",
-        "/**/*.ts",
-        "/examples/**/*"
-    ],
-    "main": "./cjs/index.js",
-    "module": "./esm/index.js",
-    "types": "types/index.d.ts",
-    "exports": {
-        ".": {
-            "import": "./esm/index.js",
-            "require": "./cjs/index.js",
-            "types": "./types/index.d.ts"
-        },
-        "./web": {
-            "import": "./esm/web/index.js",
-            "require": "./cjs/web/index.js",
-            "types": "./types/web/index.d.ts"
-        },
-        "./node": {
-            "import": "./esm/node/index.js",
-            "require": "./cjs/node/index.js",
-            "types": "./types/node/index.d.ts"
-        },
-        "./cjs/index": {
-            "import": "./esm/index.js",
-            "require": "./cjs/index.js",
-            "types": "./types/index.d.ts"
-        },
-        "./cjs/node": {
-            "import": "./esm/node/index.js",
-            "require": "./cjs/node/index.js",
-            "types": "./types/node/index.js"
-        },
-        "./cjs/node/index": {
-            "import": "./esm/node/index.js",
-            "require": "./cjs/node/index.js",
-            "types": "./types/node/index.js"
-        }
-    },
-    "repository": {
-        "type": "git",
-        "url": "git+https://github.com/CamStreamer/CamStreamerLib.git"
-    },
-    "keywords": [
-        "CamStreamer",
-        "CamOverlay",
-        "CamScripter",
-        "Camera",
-        "Axis"
-    ],
-    "author": "CamStreamer s.r.o",
-    "license": "ISC",
-    "bugs": {
-        "url": "https://github.com/CamStreamer/CamStreamerLib/issues"
-    },
-    "homepage": "https://github.com/CamStreamer/CamStreamerLib#readme"
+    "./cjs/node/index": {
+      "import": "./esm/node/index.js",
+      "require": "./cjs/node/index.js",
+      "types": "./types/node/index.js"
+    }
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/CamStreamer/CamStreamerLib.git"
+  },
+  "keywords": [
+    "CamStreamer",
+    "CamOverlay",
+    "CamScripter",
+    "Camera",
+    "Axis"
+  ],
+  "author": "CamStreamer s.r.o",
+  "license": "ISC",
+  "bugs": {
+    "url": "https://github.com/CamStreamer/CamStreamerLib/issues"
+  },
+  "homepage": "https://github.com/CamStreamer/CamStreamerLib#readme"
 }

package/types/CamOverlayAPI.d.ts

@@ -14,6 +14,12 @@ 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>;
+    getLiveViewAlias(rtspUrl: string, options?: THttpRequestOptions): Promise<{
+        alias: string;
+        ws: string;
+        ws_initial_message: string;
+    }>;
     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>;

package/types/CamSwitcherAPI.d.ts

@@ -28,9 +28,9 @@ export declare class CamSwitcherAPI<Client extends IClient<TResponse, any>> exte
     }[]>;
     wsAuthorization(options?: THttpRequestOptions): Promise<string>;
     getOutputInfo(options?: THttpRequestOptions): Promise<{
-        rtspUrl: string;
         ws: string;
         wsInitialMessage: string;
+        rtspUrl: string;
     }>;
     getAudioPushInfo(options?: THttpRequestOptions): Promise<{
         ws: string;
@@ -161,6 +161,7 @@ export declare class CamSwitcherAPI<Client extends IClient<TResponse, any>> exte
         bitrateVapixParams?: string | null | undefined;
         audioSampleRate?: number | undefined;
         audioChannelCount?: 1 | 2 | undefined;
+        audioBitrate?: number | undefined;
     } | undefined>;
     getGlobalAudioSettings(options?: THttpRequestOptions): Promise<{
         type: "source" | "fromSource";

package/types/PlaneTrackerAPI.d.ts

@@ -12,9 +12,9 @@ export declare class PlaneTrackerAPI<Client extends IClient<TResponse, any>> ext
     checkCameraTime(options?: THttpRequestOptions): Promise<boolean>;
     serverRunCheck(options?: THttpRequestOptions): Promise<boolean>;
     getLiveViewAlias(rtspUrl: string, options?: THttpRequestOptions): Promise<{
+        alias: string;
         ws: string;
         ws_initial_message: string;
-        alias: string;
     }>;
     resetPtzCalibration(options?: THttpRequestOptions): Promise<void>;
     resetFocusCalibration(options?: THttpRequestOptions): Promise<void>;
@@ -45,8 +45,23 @@ export declare class PlaneTrackerAPI<Client extends IClient<TResponse, any>> ext
             focusCalibrationPoints: string;
         };
         cameraConfig: {
-            defaultCaptureSizeMeters: number;
-            captureSizeExtensionMeters: number;
+            aircraft: {
+                defaultCaptureSizeMeters: number;
+                captureSizeExtensionMeters: number;
+            };
+            drone: {
+                defaultCaptureSizeMeters: number;
+                captureSizeExtensionMeters: number;
+            };
+        } | {
+            aircraft: {
+                defaultCaptureSizeMeters: number;
+                captureSizeExtensionMeters: number;
+            };
+            drone: {
+                defaultCaptureSizeMeters: number;
+                captureSizeExtensionMeters: number;
+            };
         };
         stream: {
             width: number;
@@ -99,11 +114,29 @@ export declare class PlaneTrackerAPI<Client extends IClient<TResponse, any>> ext
             priority: number;
         };
         identificationLabel: {
-            firstRow: "blank" | "registration" | "call_sign" | "flight_number" | "icao";
-            secondRow: "blank" | "registration" | "call_sign" | "flight_number" | "icao";
-            thirdRow: "blank" | "registration" | "call_sign" | "flight_number" | "icao";
-            fourthRow: "blank" | "registration" | "call_sign" | "flight_number" | "icao";
-            opacity: number;
+            aircraft: {
+                firstRow: "blank" | "registration" | "call_sign" | "flight_number" | "icao";
+                secondRow: "blank" | "registration" | "call_sign" | "flight_number" | "icao";
+                thirdRow: "blank" | "registration" | "call_sign" | "flight_number" | "icao";
+                fourthRow: "blank" | "registration" | "call_sign" | "flight_number" | "icao";
+                opacity: number;
+            };
+            drone: {
+                firstRow: "blank" | "remote_id";
+                opacity: number;
+            };
+        } | {
+            aircraft: {
+                firstRow: "blank" | "registration" | "call_sign" | "flight_number" | "icao";
+                secondRow: "blank" | "registration" | "call_sign" | "flight_number" | "icao";
+                thirdRow: "blank" | "registration" | "call_sign" | "flight_number" | "icao";
+                fourthRow: "blank" | "registration" | "call_sign" | "flight_number" | "icao";
+                opacity: number;
+            };
+            drone: {
+                firstRow: "blank" | "remote_id";
+                opacity: number;
+            };
         };
         acs: {
             ip: string;
@@ -181,11 +214,11 @@ export declare class PlaneTrackerAPI<Client extends IClient<TResponse, any>> ext
     importAppSettings(dataType: TImportDataType, formData: Parameters<Client['post']>[0]['data'], options?: THttpRequestOptions): Promise<void>;
     getDomainList(options?: THttpRequestOptions): Promise<Partial<Record<"adsb" | "remoteId", {
         uiName: string;
-        icon: "unknown" | "small" | "large" | "heavy" | "helicopter" | "drone" | "operator" | "vehicle";
+        icon: "unknown" | "small" | "drone" | "large" | "heavy" | "helicopter" | "operator" | "vehicle";
         categoryList: {
             categoryId: string;
             uiName: string;
-            icon: "unknown" | "small" | "large" | "heavy" | "helicopter" | "drone" | "operator" | "vehicle";
+            icon: "unknown" | "small" | "drone" | "large" | "heavy" | "helicopter" | "operator" | "vehicle";
         }[];
     }>>>;
     fetchFlightInfo(targetId: string, options?: THttpRequestOptions): Promise<{