camstreamerlib 4.0.0-beta.6 → 4.0.0-beta.8

package/cjs/CamSwitcherAPI.d.ts

@@ -3,8 +3,12 @@ import { TAudioPushInfo, TOutputInfo, TStorageInfo, TStreamSaveList, TClipList,
 import { TAudioChannel, TNetworkCamera, TStorageType } from './types/common';
 export declare class CamSwitcherAPI<Client extends IClient = IClient> {
     client: Client;
+    private CustomFormData;
     private vapixAgent;
-    constructor(client: Client);
+    constructor(client: Client, CustomFormData?: {
+        new (form?: HTMLFormElement | undefined, submitter?: HTMLElement | null | undefined): FormData;
+        prototype: FormData;
+    });
     static getProxyUrlPath: () => string;
     static getWsEventsUrlPath: () => string;
     static getClipPreviewUrlPath: (id: string, storage: TStorageType) => string;

package/cjs/CamSwitcherAPI.js

@@ -13,9 +13,11 @@ const constants_1 = require("./internal/constants");
 const baseUrl = '/local/camswitcher/api';
 class CamSwitcherAPI {
     client;
+    CustomFormData;
     vapixAgent;
-    constructor(client) {
+    constructor(client, CustomFormData = FormData) {
         this.client = client;
+        this.CustomFormData = CustomFormData;
         this.vapixAgent = new VapixAPI_1.VapixAPI(client, () => '');
     }
     static getProxyUrlPath = () => `${baseUrl}/proxy.cgi`;
@@ -102,7 +104,7 @@ class CamSwitcherAPI {
         await this.get(`${baseUrl}/playlist_queue_play_next.cgi`);
     }
     async addNewClip(file, clipType, storage, id, fileName) {
-        const formData = new FormData();
+        const formData = new this.CustomFormData();
         formData.append('clip_name', id);
         formData.append('clip_type', clipType);
         formData.append('file', file, fileName);

package/cjs/VapixAPI.js

@@ -51,8 +51,8 @@ class VapixAPI {
     }
     async getSupportedAudioSampleRate(proxy = null) {
         const url = '/axis-cgi/audio/streamingcapabilities.cgi';
-        const formData = { apiVersion: '1.0', method: 'list' };
-        const res = await this.postJson(proxy, url, formData);
+        const jsonData = { apiVersion: '1.0', method: 'list' };
+        const res = await this.postJson(proxy, url, jsonData);
         const encoders = VapixAPI_1.audioSampleRatesResponseSchema.parse(await res.json()).data.encoders;
         const data = encoders.aac ?? encoders.AAC ?? [];
         return data.map((item) => {
@@ -78,7 +78,7 @@ class VapixAPI {
             await this.postJson(proxy, '/axis-cgi/opticscontrol.cgi', data);
         }
         catch (err) {
-            await this.postJson(proxy, '/axis-cgi/opticssetup.cgi', {
+            await this.getUrlEncoded(proxy, '/axis-cgi/opticssetup.cgi', {
                 autofocus: 'perform',
                 source: '1',
             });
@@ -180,7 +180,7 @@ class VapixAPI {
         const data = { apiVersion: '1.0', method: 'getDevicesSettings' };
         const res = await this.postJson(proxy, '/axis-cgi/audiodevicecontrol.cgi', data);
         const result = VapixAPI_1.audioDeviceRequestSchema.parse(await res.json());
-        return result.devices.map((device) => ({
+        return result.data.devices.map((device) => ({
             ...device,
             inputs: (device.inputs || []).sort((a, b) => a.id.localeCompare(b.id)),
             outputs: (device.outputs || []).sort((a, b) => a.id.localeCompare(b.id)),
@@ -292,14 +292,22 @@ class VapixAPI {
             query: 'presetposcamdata',
             format: 'json',
         });
-        return parseCameraPtzResponse(await response.text())[camera] ?? [];
+        const text = await response.text();
+        if (text === '') {
+            throw new errors_1.PtzNotSupportedError();
+        }
+        return parseCameraPtzResponse(text)[camera] ?? [];
     }
     async listPtzVideoSourceOverview(proxy = null) {
         const response = await this.getUrlEncoded(proxy, '/axis-cgi/com/ptz.cgi', {
             query: 'presetposall',
             format: 'json',
         });
-        const data = parseCameraPtzResponse(await response.text());
+        const text = await response.text();
+        if (text === '') {
+            throw new errors_1.PtzNotSupportedError();
+        }
+        const data = parseCameraPtzResponse(text);
         const res = {};
         Object.keys(data)
             .map(Number)

package/cjs/errors/errors.d.ts

@@ -31,4 +31,7 @@ export declare class FetchDeviceInfoError extends Error {
 export declare class AddNewClipError extends Error {
     constructor(message: string);
 }
+export declare class PtzNotSupportedError extends Error {
+    constructor();
+}
 export {};

package/cjs/errors/errors.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AddNewClipError = exports.FetchDeviceInfoError = exports.NoDeviceInfoError = exports.MaxFPSError = exports.SDCardJobError = exports.SDCardActionError = exports.ApplicationAPIError = exports.ParsingBlobError = exports.ServiceNotFoundError = exports.ServiceUnavailableError = void 0;
+exports.PtzNotSupportedError = exports.AddNewClipError = exports.FetchDeviceInfoError = exports.NoDeviceInfoError = exports.MaxFPSError = exports.SDCardJobError = exports.SDCardActionError = exports.ApplicationAPIError = exports.ParsingBlobError = exports.ServiceNotFoundError = exports.ServiceUnavailableError = void 0;
 class ServiceUnavailableError extends Error {
     constructor() {
         super('Service is unavailable.');
@@ -77,3 +77,10 @@ class AddNewClipError extends Error {
     }
 }
 exports.AddNewClipError = AddNewClipError;
+class PtzNotSupportedError extends Error {
+    constructor() {
+        super('Ptz not supported.');
+        this.name = 'PtzNotSupportedError';
+    }
+}
+exports.PtzNotSupportedError = PtzNotSupportedError;

package/cjs/types/CamSwitcherEvents.d.ts

@@ -44,6 +44,27 @@ declare const cswEventsDataSchema: z.ZodDiscriminatedUnion<"type", [z.ZodObject<
     master_audio: boolean;
     stream_name?: string | undefined;
     clip_name?: string | undefined;
+}>, z.ZodObject<{
+    type: z.ZodLiteral<"StreamSwitchVideoError">;
+    playlist_name: z.ZodString;
+    playlist_active_stream: z.ZodNumber;
+    stream_name: z.ZodOptional<z.ZodString>;
+    clip_name: z.ZodOptional<z.ZodString>;
+    info: z.ZodString;
+}, "strip", z.ZodTypeAny, {
+    type: "StreamSwitchVideoError";
+    playlist_name: string;
+    playlist_active_stream: number;
+    info: string;
+    stream_name?: string | undefined;
+    clip_name?: string | undefined;
+}, {
+    type: "StreamSwitchVideoError";
+    playlist_name: string;
+    playlist_active_stream: number;
+    info: string;
+    stream_name?: string | undefined;
+    clip_name?: string | undefined;
 }>, z.ZodObject<{
     type: z.ZodLiteral<"StreamSwitchAudioError">;
     stream_name: z.ZodOptional<z.ZodString>;
@@ -176,6 +197,27 @@ export declare const cswEventsSchema: z.ZodDiscriminatedUnion<"type", [z.ZodObje
         master_audio: boolean;
         stream_name?: string | undefined;
         clip_name?: string | undefined;
+    }>, z.ZodObject<{
+        type: z.ZodLiteral<"StreamSwitchVideoError">;
+        playlist_name: z.ZodString;
+        playlist_active_stream: z.ZodNumber;
+        stream_name: z.ZodOptional<z.ZodString>;
+        clip_name: z.ZodOptional<z.ZodString>;
+        info: z.ZodString;
+    }, "strip", z.ZodTypeAny, {
+        type: "StreamSwitchVideoError";
+        playlist_name: string;
+        playlist_active_stream: number;
+        info: string;
+        stream_name?: string | undefined;
+        clip_name?: string | undefined;
+    }, {
+        type: "StreamSwitchVideoError";
+        playlist_name: string;
+        playlist_active_stream: number;
+        info: string;
+        stream_name?: string | undefined;
+        clip_name?: string | undefined;
     }>, z.ZodObject<{
         type: z.ZodLiteral<"StreamSwitchAudioError">;
         stream_name: z.ZodOptional<z.ZodString>;
@@ -278,6 +320,13 @@ export declare const cswEventsSchema: z.ZodDiscriminatedUnion<"type", [z.ZodObje
         master_audio: boolean;
         stream_name?: string | undefined;
         clip_name?: string | undefined;
+    } | {
+        type: "StreamSwitchVideoError";
+        playlist_name: string;
+        playlist_active_stream: number;
+        info: string;
+        stream_name?: string | undefined;
+        clip_name?: string | undefined;
     } | {
         type: "StreamSwitchAudioError";
         master_audio: boolean;
@@ -324,6 +373,13 @@ export declare const cswEventsSchema: z.ZodDiscriminatedUnion<"type", [z.ZodObje
         master_audio: boolean;
         stream_name?: string | undefined;
         clip_name?: string | undefined;
+    } | {
+        type: "StreamSwitchVideoError";
+        playlist_name: string;
+        playlist_active_stream: number;
+        info: string;
+        stream_name?: string | undefined;
+        clip_name?: string | undefined;
     } | {
         type: "StreamSwitchAudioError";
         master_audio: boolean;
@@ -398,6 +454,27 @@ export declare const cswEventsSchema: z.ZodDiscriminatedUnion<"type", [z.ZodObje
     master_audio: boolean;
     stream_name?: string | undefined;
     clip_name?: string | undefined;
+}>, z.ZodObject<{
+    type: z.ZodLiteral<"StreamSwitchVideoError">;
+    playlist_name: z.ZodString;
+    playlist_active_stream: z.ZodNumber;
+    stream_name: z.ZodOptional<z.ZodString>;
+    clip_name: z.ZodOptional<z.ZodString>;
+    info: z.ZodString;
+}, "strip", z.ZodTypeAny, {
+    type: "StreamSwitchVideoError";
+    playlist_name: string;
+    playlist_active_stream: number;
+    info: string;
+    stream_name?: string | undefined;
+    clip_name?: string | undefined;
+}, {
+    type: "StreamSwitchVideoError";
+    playlist_name: string;
+    playlist_active_stream: number;
+    info: string;
+    stream_name?: string | undefined;
+    clip_name?: string | undefined;
 }>, z.ZodObject<{
     type: z.ZodLiteral<"StreamSwitchAudioError">;
     stream_name: z.ZodOptional<z.ZodString>;

package/cjs/types/CamSwitcherEvents.js

@@ -19,6 +19,14 @@ const cswEventsDataSchema = zod_1.z.discriminatedUnion('type', [
         clip_name: zod_1.z.string().optional(),
         master_audio: zod_1.z.boolean(),
     }),
+    zod_1.z.object({
+        type: zod_1.z.literal('StreamSwitchVideoError'),
+        playlist_name: zod_1.z.string(),
+        playlist_active_stream: zod_1.z.number(),
+        stream_name: zod_1.z.string().optional(),
+        clip_name: zod_1.z.string().optional(),
+        info: zod_1.z.string(),
+    }),
     zod_1.z.object({
         type: zod_1.z.literal('StreamSwitchAudioError'),
         stream_name: zod_1.z.string().optional(),