camstreamerlib 4.0.27-c8f267f → 4.0.28-f67e7db

package/cjs/CamSwitcherAPI.js

@@ -9,6 +9,7 @@ const CamSwitcherAPI_1 = require("./types/CamSwitcherAPI");
 const common_1 = require("./types/common");
 const VapixAPI_1 = require("./VapixAPI");
 const BasicAPI_1 = require("./internal/BasicAPI");
+const helpers_1 = require("./helpers");
 const BASE_PATH = '/local/camswitcher/api';
 class CamSwitcherAPI extends BasicAPI_1.BasicAPI {
     CustomFormData;
@@ -273,20 +274,7 @@ class CamSwitcherAPI extends BasicAPI_1.BasicAPI {
         if (data[paramName] === undefined) {
             throw new errors_1.ParameterNotFoundError(paramName);
         }
-        if (data[paramName] === '') {
-            return {};
-        }
-        try {
-            return JSON.parse(data[paramName] + '');
-        }
-        catch {
-            try {
-                return JSON.parse(decodeURIComponent((data[paramName] + '').replaceAll('\\', '')));
-            }
-            catch (e) {
-                throw new errors_1.JsonParseError(paramName, data[paramName]);
-            }
-        }
+        return (0, helpers_1.jsonParseCameraParam)(data[paramName] + '', paramName);
     }
     async getUploadedFileList(clipName, storage, options) {
         const res = await this._getJson(`${BASE_PATH}/clip_files.cgi`, { clip_name: clipName, storage }, options);

package/cjs/PlaneTrackerAPI.d.ts

@@ -40,7 +40,6 @@ export declare class PlaneTrackerAPI<Client extends IClient<TResponse, any>> ext
         cameraCalibrationProcessConfig: {
             nightSkyCalibrationEnabled: boolean;
             scheduleNightSkyCalibrationTimestamp: number;
-            nightSkyCalibrationRepeatCount: number;
             nightSkyCalibrationFocusValue: number;
             focusCalibrationPoints: string;
         };

package/cjs/VapixAPI.js

@@ -76,7 +76,13 @@ class VapixAPI extends BasicAPI_1.BasicAPI {
         const jsonData = { apiVersion: '1.0', method: 'list' };
         const res = await this._postJsonEncoded(path, jsonData, undefined, options);
         const encoders = VapixAPI_1.audioSampleRatesResponseSchema.parse(await res.json()).data.encoders;
-        return encoders.aac ?? encoders.AAC ?? [];
+        const data = encoders.aac ?? encoders.AAC ?? [];
+        return data.map((item) => {
+            return {
+                sampleRate: item.sample_rate,
+                bitRates: item.bit_rates,
+            };
+        });
     }
     async performAutofocus(options) {
         try {

package/cjs/helpers.d.ts

@@ -0,0 +1 @@
+export declare const jsonParseCameraParam: (param: string, paramName: string) => any;

package/cjs/helpers.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.jsonParseCameraParam = void 0;
+const errors_1 = require("./errors/errors");
+const jsonParseCameraParam = (param, paramName) => {
+    if (param === '') {
+        return {};
+    }
+    try {
+        return JSON.parse(param);
+    }
+    catch {
+        try {
+            return JSON.parse(decodeURIComponent(param.replaceAll('\\', '')));
+        }
+        catch (e) {
+            throw new errors_1.JsonParseError(paramName, param);
+        }
+    }
+};
+exports.jsonParseCameraParam = jsonParseCameraParam;

package/cjs/index.d.ts

@@ -26,3 +26,4 @@ export { CamScripterAPI } from './CamScripterAPI';
 export * from './types/CamScripterAPI';
 export { VapixAPI } from './VapixAPI';
 export * from './types/VapixAPI';
+export * from './helpers';

package/cjs/index.js

@@ -53,3 +53,4 @@ __exportStar(require("./types/CamScripterAPI"), exports);
 var VapixAPI_1 = require("./VapixAPI");
 Object.defineProperty(exports, "VapixAPI", { enumerable: true, get: function () { return VapixAPI_1.VapixAPI; } });
 __exportStar(require("./types/VapixAPI"), exports);
+__exportStar(require("./helpers"), exports);

package/cjs/internal/convertors.js

@@ -77,7 +77,7 @@ const parseVideoOptionsToVapixParams = (firmWareVersion, video) => {
     const nbrOfChannels = video.nbrOfChannels ? (video.audio === 1 ? `&nbrOfChannels=${video.nbrOfChannels}` : '') : '';
     const audioParams = `audio=${video.audio}${nbrOfChannels}`;
     const videoCodecParams = video.videoCodec === 'h264'
-        ? `videocodec=${video.videoCodec}&h264Profile=${video.h264Profile}`
+        ? `videocodec=${video.videoCodec}&h264profile=${video.h264Profile}`
         : `videocodec=${video.videoCodec}`;
     const videoParams = `camera=${video.camera}&resolution=${video.resolution}&fps=${video.fps}&compression=${video.compression}&videokeyframeinterval=${video.govLength}&${videoCodecParams}${overlaysParams}`;
     return [videoParams, bitrateParams, audioParams].join('&');
@@ -92,7 +92,7 @@ const parseVapixParamsToVideoOptions = (internalVapixParams) => {
     });
     let h264Profile = undefined;
     if (params['videocodec'] === 'h264') {
-        h264Profile = (params['h264Profile'] ?? 'high');
+        h264Profile = (params['h264profile'] ?? params['h264Profile'] ?? 'high');
     }
     let nbrOfChannels = undefined;
     if (params['audio'] === '1') {

package/cjs/types/PlaneTrackerAPI.d.ts

@@ -116,19 +116,16 @@ export declare const cameraSettingsSchema: z.ZodObject<{
     cameraCalibrationProcessConfig: z.ZodDefault<z.ZodObject<{
         nightSkyCalibrationEnabled: z.ZodBoolean;
         scheduleNightSkyCalibrationTimestamp: z.ZodNumber;
-        nightSkyCalibrationRepeatCount: z.ZodDefault<z.ZodNumber>;
         nightSkyCalibrationFocusValue: z.ZodDefault<z.ZodNumber>;
         focusCalibrationPoints: z.ZodDefault<z.ZodString>;
     }, "strip", z.ZodTypeAny, {
         nightSkyCalibrationEnabled: boolean;
         scheduleNightSkyCalibrationTimestamp: number;
-        nightSkyCalibrationRepeatCount: number;
         nightSkyCalibrationFocusValue: number;
         focusCalibrationPoints: string;
     }, {
         nightSkyCalibrationEnabled: boolean;
         scheduleNightSkyCalibrationTimestamp: number;
-        nightSkyCalibrationRepeatCount?: number | undefined;
         nightSkyCalibrationFocusValue?: number | undefined;
         focusCalibrationPoints?: string | undefined;
     }>>;
@@ -455,7 +452,6 @@ export declare const cameraSettingsSchema: z.ZodObject<{
     cameraCalibrationProcessConfig: {
         nightSkyCalibrationEnabled: boolean;
         scheduleNightSkyCalibrationTimestamp: number;
-        nightSkyCalibrationRepeatCount: number;
         nightSkyCalibrationFocusValue: number;
         focusCalibrationPoints: string;
     };
@@ -589,7 +585,6 @@ export declare const cameraSettingsSchema: z.ZodObject<{
     cameraCalibrationProcessConfig?: {
         nightSkyCalibrationEnabled: boolean;
         scheduleNightSkyCalibrationTimestamp: number;
-        nightSkyCalibrationRepeatCount?: number | undefined;
         nightSkyCalibrationFocusValue?: number | undefined;
         focusCalibrationPoints?: string | undefined;
     } | undefined;

package/cjs/types/PlaneTrackerAPI.js

@@ -73,14 +73,12 @@ exports.cameraSettingsSchema = zod_1.z.object({
         .object({
         nightSkyCalibrationEnabled: zod_1.z.boolean(),
         scheduleNightSkyCalibrationTimestamp: zod_1.z.number(),
-        nightSkyCalibrationRepeatCount: zod_1.z.number().int().min(1).max(6).default(1),
         nightSkyCalibrationFocusValue: zod_1.z.number().int().min(1).max(9999).default(9000),
         focusCalibrationPoints: zod_1.z.string().default(''),
     })
         .default({
         nightSkyCalibrationEnabled: false,
         scheduleNightSkyCalibrationTimestamp: 0,
-        nightSkyCalibrationRepeatCount: 1,
         nightSkyCalibrationFocusValue: 9000,
         focusCalibrationPoints: '',
     }),

package/cjs/types/VapixAPI.d.ts

@@ -133,7 +133,7 @@ export declare const guardTourSchema: z.ZodObject<{
     timeBetweenSequences?: unknown;
 }>;
 export type TGuardTour = z.infer<typeof guardTourSchema>;
-declare const audioSampleRatesSchema: z.ZodEffects<z.ZodObject<{
+declare const audioSampleRatesOutSchema: z.ZodEffects<z.ZodObject<{
     sample_rate: z.ZodNumber;
     bit_rates: z.ZodArray<z.ZodNumber, "many">;
 }, "strip", z.ZodTypeAny, {
@@ -149,7 +149,7 @@ declare const audioSampleRatesSchema: z.ZodEffects<z.ZodObject<{
     sample_rate: number;
     bit_rates: number[];
 }>;
-export type TAudioSampleRates = z.infer<typeof audioSampleRatesSchema>;
+export type TAudioSampleRates = z.infer<typeof audioSampleRatesOutSchema>;
 export declare const sdCardWatchedStatuses: readonly ["OK", "connected", "disconnected"];
 export declare const sdCardInfoSchema: z.ZodObject<{
     status: z.ZodEnum<["OK", "connected", "disconnected"]>;
@@ -1666,7 +1666,7 @@ export declare const timeZoneSchema: z.ZodDiscriminatedUnion<"status", [z.ZodObj
 export declare const audioSampleRatesResponseSchema: z.ZodObject<{
     data: z.ZodObject<{
         encoders: z.ZodObject<{
-            aac: z.ZodOptional<z.ZodArray<z.ZodEffects<z.ZodObject<{
+            aac: z.ZodOptional<z.ZodArray<z.ZodObject<{
                 sample_rate: z.ZodNumber;
                 bit_rates: z.ZodArray<z.ZodNumber, "many">;
             }, "strip", z.ZodTypeAny, {
@@ -1675,14 +1675,8 @@ export declare const audioSampleRatesResponseSchema: z.ZodObject<{
             }, {
                 sample_rate: number;
                 bit_rates: number[];
-            }>, {
-                sampleRate: number;
-                bitRates: number[];
-            }, {
-                sample_rate: number;
-                bit_rates: number[];
             }>, "many">>;
-            AAC: z.ZodOptional<z.ZodArray<z.ZodEffects<z.ZodObject<{
+            AAC: z.ZodOptional<z.ZodArray<z.ZodObject<{
                 sample_rate: z.ZodNumber;
                 bit_rates: z.ZodArray<z.ZodNumber, "many">;
             }, "strip", z.ZodTypeAny, {
@@ -1691,21 +1685,15 @@ export declare const audioSampleRatesResponseSchema: z.ZodObject<{
             }, {
                 sample_rate: number;
                 bit_rates: number[];
-            }>, {
-                sampleRate: number;
-                bitRates: number[];
-            }, {
-                sample_rate: number;
-                bit_rates: number[];
             }>, "many">>;
         }, "strip", z.ZodTypeAny, {
             aac?: {
-                sampleRate: number;
-                bitRates: number[];
+                sample_rate: number;
+                bit_rates: number[];
             }[] | undefined;
             AAC?: {
-                sampleRate: number;
-                bitRates: number[];
+                sample_rate: number;
+                bit_rates: number[];
             }[] | undefined;
         }, {
             aac?: {
@@ -1720,12 +1708,12 @@ export declare const audioSampleRatesResponseSchema: z.ZodObject<{
     }, "strip", z.ZodTypeAny, {
         encoders: {
             aac?: {
-                sampleRate: number;
-                bitRates: number[];
+                sample_rate: number;
+                bit_rates: number[];
             }[] | undefined;
             AAC?: {
-                sampleRate: number;
-                bitRates: number[];
+                sample_rate: number;
+                bit_rates: number[];
             }[] | undefined;
         };
     }, {
@@ -1744,12 +1732,12 @@ export declare const audioSampleRatesResponseSchema: z.ZodObject<{
     data: {
         encoders: {
             aac?: {
-                sampleRate: number;
-                bitRates: number[];
+                sample_rate: number;
+                bit_rates: number[];
             }[] | undefined;
             AAC?: {
-                sampleRate: number;
-                bitRates: number[];
+                sample_rate: number;
+                bit_rates: number[];
             }[] | undefined;
         };
     };

package/cjs/types/VapixAPI.js

@@ -53,12 +53,11 @@ exports.guardTourSchema = zod_1.z.object({
         waitTimeViewType: zod_1.z.unknown(),
     })),
 });
-const audioSampleRatesSchema = zod_1.z
-    .object({
+const audioSampleRatesSchema = zod_1.z.object({
     sample_rate: zod_1.z.number(),
     bit_rates: zod_1.z.array(zod_1.z.number()),
-})
-    .transform(transformers_1.toCamelCaseDeep);
+});
+const audioSampleRatesOutSchema = audioSampleRatesSchema.transform(transformers_1.toCamelCaseDeep);
 exports.sdCardWatchedStatuses = ['OK', 'connected', 'disconnected'];
 exports.sdCardInfoSchema = zod_1.z.object({
     status: zod_1.z.enum(exports.sdCardWatchedStatuses),