camstreamerlib 4.0.0-beta.120 → 4.0.0-beta.122

package/cjs/CamStreamerAPI.d.ts

@@ -2870,7 +2870,13 @@ export declare class CamStreamerAPI<Client extends IClient<TResponse, any>> exte
         streamIdentifier?: string | undefined;
     }>;
     setStream(streamId: string, streamData: TStream, options?: THttpRequestOptions): Promise<void>;
-    isStreaming(streamId: string, options?: THttpRequestOptions): Promise<boolean>;
+    getStreamStats(streamId: number, options?: THttpRequestOptions): Promise<{
+        net_stats: string;
+        stream_bytes_time_ms: number;
+        stream_bytes: number;
+        start_count: number;
+        is_streaming: number;
+    }>;
     setStreamEnabled(streamId: string, enabled: boolean, options?: THttpRequestOptions): Promise<void>;
     setStreamActive(streamId: string, active: boolean, options?: THttpRequestOptions): Promise<void>;
     listFiles(options?: THttpRequestOptions): Promise<{

package/cjs/CamStreamerAPI.js

@@ -91,9 +91,9 @@ class CamStreamerAPI extends BasicAPI_1.BasicAPI {
             stream_id: streamId,
         }, options);
     }
-    async isStreaming(streamId, options) {
+    async getStreamStats(streamId, options) {
         const res = await this._getJson(`${BASE_PATH}/get_streamstat.cgi`, { stream_id: streamId }, options);
-        return res.data.is_streaming === 1;
+        return CamStreamerAPI_1.streamStatsSchema.parse(res.data);
     }
     async setStreamEnabled(streamId, enabled, options) {
         await this._postUrlEncoded(`${BASE_PATH}/set_stream_enabled.cgi`, { stream_id: streamId, enabled: enabled ? 1 : 0 }, options);

package/cjs/VapixAPI.d.ts

@@ -1,17 +1,13 @@
-import { IClient, TParameters, TResponse } from './internal/types';
+import { IClient, TResponse } from './internal/types';
 import { TAudioDevice, TPortSetSchema, TPortSequenceStateSchema } from './types/VapixAPI';
-import { ProxyClient } from './internal/ProxyClient';
-import { TCameraImageConfig, THttpRequestOptions, TProxyParams } from './types/common';
-export declare class VapixAPI<Client extends IClient<TResponse, any>> {
-    private client;
+import { TCameraImageConfig, THttpRequestOptions } from './types/common';
+import { BasicAPI } from './internal/BasicAPI';
+export declare class VapixAPI<Client extends IClient<TResponse, any>> extends BasicAPI<Client> {
     private CustomFormData;
     constructor(client: Client, CustomFormData?: {
         new (form?: HTMLFormElement | undefined, submitter?: HTMLElement | null | undefined): FormData;
         prototype: FormData;
     });
-    getClient(proxyParams?: TProxyParams): Client | ProxyClient<Client>;
-    postUrlEncoded(path: string, parameters?: TParameters, headers?: Record<string, string>, options?: THttpRequestOptions): Promise<TResponse>;
-    postJson(path: string, jsonData: Record<string, any>, headers?: Record<string, string>, options?: THttpRequestOptions): Promise<TResponse>;
     getCameraImage(parameters: TCameraImageConfig, options?: THttpRequestOptions): Promise<ReturnType<Client["get"]>>;
     getEventDeclarations(options?: THttpRequestOptions): Promise<string>;
     getSupportedAudioSampleRate(options?: THttpRequestOptions): Promise<{
@@ -28,7 +24,7 @@ export declare class VapixAPI<Client extends IClient<TResponse, any>> {
     unmountSDCard(options?: THttpRequestOptions): Promise<number>;
     private _doSDCardMountAction;
     fetchSDCardJobProgress(jobId: number, options?: THttpRequestOptions): Promise<number>;
-    downloadCameraReport(options?: THttpRequestOptions): Promise<TResponse>;
+    downloadCameraReport(options?: THttpRequestOptions): Promise<string>;
     getSystemLog(options?: THttpRequestOptions): Promise<TResponse>;
     getMaxFps(channel: number, options?: THttpRequestOptions): Promise<number>;
     getTimezone(options?: THttpRequestOptions): Promise<string>;

package/cjs/VapixAPI.js

@@ -4,39 +4,15 @@ exports.VapixAPI = void 0;
 const utils_1 = require("./internal/utils");
 const VapixAPI_1 = require("./types/VapixAPI");
 const errors_1 = require("./errors/errors");
-const ProxyClient_1 = require("./internal/ProxyClient");
 const zod_1 = require("zod");
 const fast_xml_parser_1 = require("fast-xml-parser");
-class VapixAPI {
-    client;
+const BasicAPI_1 = require("./internal/BasicAPI");
+class VapixAPI extends BasicAPI_1.BasicAPI {
     CustomFormData;
     constructor(client, CustomFormData = FormData) {
-        this.client = client;
+        super(client);
         this.CustomFormData = CustomFormData;
     }
-    getClient(proxyParams) {
-        return proxyParams ? new ProxyClient_1.ProxyClient(this.client, proxyParams) : this.client;
-    }
-    async postUrlEncoded(path, parameters, headers, options) {
-        const data = (0, utils_1.paramToUrl)(parameters);
-        const head = { ...headers, 'Content-Type': 'application/x-www-form-urlencoded' };
-        const agent = this.getClient(options?.proxyParams);
-        const res = await agent.post({ path, data, headers: head, timeout: options?.timeout });
-        if (!res.ok) {
-            throw new errors_1.ErrorWithResponse(res);
-        }
-        return res;
-    }
-    async postJson(path, jsonData, headers, options) {
-        const data = JSON.stringify(jsonData);
-        const head = { ...headers, 'Content-Type': 'application/json' };
-        const agent = this.getClient(options?.proxyParams);
-        const res = await agent.post({ path, data, headers: head, timeout: options?.timeout });
-        if (!res.ok) {
-            throw new errors_1.ErrorWithResponse(res);
-        }
-        return res;
-    }
     async getCameraImage(parameters, options) {
         const agent = this.getClient(options?.proxyParams);
         return (await agent.get({
@@ -66,7 +42,7 @@ class VapixAPI {
     async getSupportedAudioSampleRate(options) {
         const path = '/axis-cgi/audio/streamingcapabilities.cgi';
         const jsonData = { apiVersion: '1.0', method: 'list' };
-        const res = await this.postJson(path, jsonData, undefined, options);
+        const res = await this._postJsonEncoded(path, jsonData, undefined, options);
         const encoders = VapixAPI_1.audioSampleRatesResponseSchema.parse(await res.json()).data.encoders;
         const data = encoders.aac ?? encoders.AAC ?? [];
         return data.map((item) => {
@@ -89,19 +65,19 @@ class VapixAPI {
                     ],
                 },
             };
-            await this.postJson('/axis-cgi/opticscontrol.cgi', data, undefined, options);
+            await this._postJsonEncoded('/axis-cgi/opticscontrol.cgi', data, undefined, options);
         }
         catch (err) {
-            await this.postUrlEncoded('/axis-cgi/opticssetup.cgi', {
+            await this._postUrlEncoded('/axis-cgi/opticssetup.cgi', {
                 autofocus: 'perform',
                 source: '1',
-            }, undefined, options);
+            }, options);
         }
     }
     async checkSDCard(options) {
-        const res = await this.postUrlEncoded('/axis-cgi/disks/list.cgi', {
+        const res = await this._postUrlEncoded('/axis-cgi/disks/list.cgi', {
             diskid: 'SD_DISK',
-        }, undefined, options);
+        }, options);
         const xmlText = await res.text();
         const parser = new fast_xml_parser_1.XMLParser({
             ignoreAttributes: false,
@@ -123,10 +99,10 @@ class VapixAPI {
         return this._doSDCardMountAction('UNMOUNT', options);
     }
     async _doSDCardMountAction(action, options) {
-        const res = await this.postUrlEncoded('/axis-cgi/disks/mount.cgi', {
+        const res = await this._postUrlEncoded('/axis-cgi/disks/mount.cgi', {
             action: action,
             diskid: 'SD_DISK',
-        }, undefined, options);
+        }, options);
         const textXml = await res.text();
         const parser = new fast_xml_parser_1.XMLParser({
             ignoreAttributes: false,
@@ -141,10 +117,10 @@ class VapixAPI {
         return Number(job.jobid);
     }
     async fetchSDCardJobProgress(jobId, options) {
-        const res = await this.postUrlEncoded('/disks/job.cgi', {
+        const res = await this._postUrlEncoded('/disks/job.cgi', {
             jobid: String(jobId),
             diskid: 'SD_DISK',
-        }, undefined, options);
+        }, options);
         const textXml = await res.text();
         const parser = new fast_xml_parser_1.XMLParser({
             ignoreAttributes: false,
@@ -158,14 +134,14 @@ class VapixAPI {
         return Number(job.progress);
     }
     downloadCameraReport(options) {
-        return this.postUrlEncoded('/axis-cgi/serverreport.cgi', { mode: 'text' }, undefined, options);
+        return this._getText('/axis-cgi/serverreport.cgi', { mode: 'text' }, options);
     }
     getSystemLog(options) {
-        return this.postUrlEncoded('/axis-cgi/admin/systemlog.cgi', undefined, undefined, options);
+        return this._postUrlEncoded('/axis-cgi/admin/systemlog.cgi', {}, options);
     }
     async getMaxFps(channel, options) {
         const data = { apiVersion: '1.0', method: 'getCaptureModes' };
-        const res = await this.postJson('/axis-cgi/capturemode.cgi', data, undefined, options);
+        const res = await this._postJsonEncoded('/axis-cgi/capturemode.cgi', data, undefined, options);
         const response = VapixAPI_1.maxFpsResponseSchema.parse(await res.json());
         const channels = response.data;
         if (channels === undefined) {
@@ -211,12 +187,12 @@ class VapixAPI {
     }
     async getDateTimeInfo(options) {
         const data = { apiVersion: '1.0', method: 'getDateTimeInfo' };
-        const res = await this.postJson('/axis-cgi/time.cgi', data, undefined, options);
+        const res = await this._postJsonEncoded('/axis-cgi/time.cgi', data, undefined, options);
         return VapixAPI_1.dateTimeinfoSchema.parse(await res.json());
     }
     async getDevicesSettings(options) {
         const data = { apiVersion: '1.0', method: 'getDevicesSettings' };
-        const res = await this.postJson('/axis-cgi/audiodevicecontrol.cgi', data, undefined, options);
+        const res = await this._postJsonEncoded('/axis-cgi/audiodevicecontrol.cgi', data, undefined, options);
         const result = VapixAPI_1.audioDeviceRequestSchema.parse(await res.json());
         return result.data.devices.map((device) => ({
             ...device,
@@ -225,7 +201,7 @@ class VapixAPI {
         }));
     }
     async fetchRemoteDeviceInfo(payload, options) {
-        const res = await this.postJson('/axis-cgi/basicdeviceinfo.cgi', payload, undefined, options);
+        const res = await this._postJsonEncoded('/axis-cgi/basicdeviceinfo.cgi', payload, undefined, options);
         const json = await res.json();
         if ((0, utils_1.isNullish)(json.data)) {
             throw new errors_1.NoDeviceInfoError();
@@ -234,25 +210,25 @@ class VapixAPI {
     }
     async getHeaders(options) {
         const data = { apiVersion: '1.0', method: 'list' };
-        const res = await this.postJson('/axis-cgi/customhttpheader.cgi', data, undefined, options);
+        const res = await this._postJsonEncoded('/axis-cgi/customhttpheader.cgi', data, undefined, options);
         return zod_1.z.object({ data: zod_1.z.record(zod_1.z.string()) }).parse(await res.json()).data;
     }
     async setHeaders(headers, options) {
         const data = { apiVersion: '1.0', method: 'set', params: headers };
-        return this.postJson('/axis-cgi/customhttpheader.cgi', data, undefined, options);
+        return this._postJsonEncoded('/axis-cgi/customhttpheader.cgi', data, undefined, options);
     }
     async getParameter(paramNames, options) {
-        const response = await this.postUrlEncoded('/axis-cgi/param.cgi', {
+        const response = await this._postUrlEncoded('/axis-cgi/param.cgi', {
             action: 'list',
             group: (0, utils_1.arrayToUrl)(paramNames),
-        }, undefined, options);
+        }, options);
         return VapixAPI.parseParameters(await response.text());
     }
     async setParameter(params, options) {
-        const res = await this.postUrlEncoded('/axis-cgi/param.cgi', {
+        const res = await this._postUrlEncoded('/axis-cgi/param.cgi', {
             ...params,
             action: 'update',
-        }, undefined, options);
+        }, options);
         const responseText = await res.text();
         if (responseText.startsWith('# Error')) {
             throw new errors_1.SettingParameterError(responseText);
@@ -300,10 +276,10 @@ class VapixAPI {
         return this.setParameter(params, options);
     }
     async getPTZPresetList(channel, options) {
-        const res = await this.postUrlEncoded('/axis-cgi/com/ptz.cgi', {
+        const res = await this._postUrlEncoded('/axis-cgi/com/ptz.cgi', {
             query: 'presetposcam',
             camera: channel,
-        }, undefined, options);
+        }, options);
         const text = await res.text();
         const lines = text.split(/[\r\n]/);
         const positions = [];
@@ -320,11 +296,11 @@ class VapixAPI {
     }
     async listPTZ(camera, options) {
         const url = `/axis-cgi/com/ptz.cgi`;
-        const response = await this.postUrlEncoded(url, {
+        const response = await this._postUrlEncoded(url, {
             camera,
             query: 'presetposcamdata',
             format: 'json',
-        }, undefined, options);
+        }, options);
         const text = await response.text();
         if (text === '') {
             throw new errors_1.PtzNotSupportedError();
@@ -332,10 +308,10 @@ class VapixAPI {
         return VapixAPI.parseCameraPtzResponse(text)[camera] ?? [];
     }
     async listPtzVideoSourceOverview(options) {
-        const response = await this.postUrlEncoded('/axis-cgi/com/ptz.cgi', {
+        const response = await this._postUrlEncoded('/axis-cgi/com/ptz.cgi', {
             query: 'presetposall',
             format: 'json',
-        }, undefined, options);
+        }, options);
         const text = await response.text();
         if (text === '') {
             throw new errors_1.PtzNotSupportedError();
@@ -353,16 +329,16 @@ class VapixAPI {
         return VapixAPI_1.ptzOverviewSchema.parse(res);
     }
     goToPreset(channel, presetName, options) {
-        return this.postUrlEncoded('/axis-cgi/com/ptz.cgi', {
+        return this._postUrlEncoded('/axis-cgi/com/ptz.cgi', {
             camera: channel.toString(),
             gotoserverpresetname: presetName,
-        }, undefined, options);
+        }, options);
     }
     async getPtzPosition(camera, options) {
-        const res = await this.postUrlEncoded('/axis-cgi/com/ptz.cgi', {
+        const res = await this._postUrlEncoded('/axis-cgi/com/ptz.cgi', {
             query: 'position',
             camera: camera.toString(),
-        }, undefined, options);
+        }, options);
         const params = VapixAPI.parseParameters(await res.text());
         return VapixAPI_1.cameraPTZItemDataSchema.parse({
             pan: Number(params.pan),
@@ -371,7 +347,7 @@ class VapixAPI {
         });
     }
     async getPorts(options) {
-        const res = await this.postJson('/axis-cgi/io/portmanagement.cgi', {
+        const res = await this._postJsonEncoded('/axis-cgi/io/portmanagement.cgi', {
             apiVersion: '1.0',
             context: '',
             method: 'getPorts',
@@ -380,7 +356,7 @@ class VapixAPI {
         return portResponseParsed.data.items;
     }
     async setPorts(ports, options) {
-        await this.postJson('/axis-cgi/io/portmanagement.cgi', {
+        await this._postJsonEncoded('/axis-cgi/io/portmanagement.cgi', {
             apiVersion: '1.0',
             context: '',
             method: 'setPorts',
@@ -388,7 +364,7 @@ class VapixAPI {
         }, undefined, options);
     }
     async setPortStateSequence(port, sequence, options) {
-        await this.postJson('/axis-cgi/io/portmanagement.cgi', {
+        await this._postJsonEncoded('/axis-cgi/io/portmanagement.cgi', {
             apiVersion: '1.0',
             context: '',
             method: 'setStateSequence',
@@ -396,27 +372,27 @@ class VapixAPI {
         }, undefined, options);
     }
     async addCameraUser(username, pass, sgrp, comment, options) {
-        return await this.postUrlEncoded('/axis-cgi/pwdgrp.cgi', {
+        return await this._postUrlEncoded('/axis-cgi/pwdgrp.cgi', {
             action: 'add',
             user: username,
             pwd: pass,
             grp: 'users',
             sgrp,
             comment,
-        }, undefined, options);
+        }, options);
     }
     async getCameraUsers(options) {
-        const res = await this.postUrlEncoded('/axis-cgi/pwdgrp.cgi', {
+        const res = await this._postUrlEncoded('/axis-cgi/pwdgrp.cgi', {
             action: 'get',
-        }, undefined, options);
+        }, options);
         return await res.text();
     }
     async editCameraUser(username, pass, options) {
-        return await this.postUrlEncoded('/axis-cgi/pwdgrp.cgi', {
+        return await this._postUrlEncoded('/axis-cgi/pwdgrp.cgi', {
             action: 'update',
             user: username,
             pwd: pass,
-        }, undefined, options);
+        }, options);
     }
     async getApplicationList(options) {
         const agent = this.getClient(options?.proxyParams);

package/cjs/internal/BasicAPI.js

@@ -67,7 +67,7 @@ class BasicAPI {
             path,
             data: jsonData,
             parameters,
-            headers: { 'Accept': 'application/json', 'Content-Type': 'application/json' },
+            headers: { 'Content-Type': 'application/json' },
             timeout: options?.timeout,
         });
         if (res.ok) {

package/cjs/types/CamStreamerAPI/CamStreamerAPI.d.ts

@@ -20256,3 +20256,23 @@ export declare const audioLocalSchema: z.ZodObject<{
     storage: "flash" | "SD0";
 }>;
 export type TAudioLocalType = z.infer<typeof audioLocalSchema>;
+export declare const streamStatsSchema: z.ZodObject<{
+    net_stats: z.ZodString;
+    stream_bytes_time_ms: z.ZodNumber;
+    stream_bytes: z.ZodNumber;
+    start_count: z.ZodNumber;
+    is_streaming: z.ZodNumber;
+}, "strip", z.ZodTypeAny, {
+    net_stats: string;
+    stream_bytes_time_ms: number;
+    stream_bytes: number;
+    start_count: number;
+    is_streaming: number;
+}, {
+    net_stats: string;
+    stream_bytes_time_ms: number;
+    stream_bytes: number;
+    start_count: number;
+    is_streaming: number;
+}>;
+export type TStreamStats = z.infer<typeof streamStatsSchema>;

package/cjs/types/CamStreamerAPI/CamStreamerAPI.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.audioLocalSchema = exports.audioUrlSchema = exports.audioFileListSchema = exports.audioFileSchema = exports.storageListSchema = exports.audioFileStorageTypeSchema = exports.AudioType = exports.isYoutubeRtmpStream = exports.isGameChangerStream = exports.isMicrosoftStream = exports.isMicrosoftAzureStream = exports.isIbmStream = exports.isDailymotionStream = exports.isWowzaStream = exports.isHlsPushStream = exports.isHlsPullStream = exports.isDaCastStream = exports.isSrtStream = exports.isChurchStream = exports.isTwitchStream = exports.isVimeoStream = exports.isYouTubeStream = exports.isWindyStream = exports.isSdCardStream = exports.isRtmpStream = exports.isMpegDvbStream = exports.isFacebookStream = exports.streamListSchema = exports.streamSchema = void 0;
+exports.streamStatsSchema = exports.audioLocalSchema = exports.audioUrlSchema = exports.audioFileListSchema = exports.audioFileSchema = exports.storageListSchema = exports.audioFileStorageTypeSchema = exports.AudioType = exports.isYoutubeRtmpStream = exports.isGameChangerStream = exports.isMicrosoftStream = exports.isMicrosoftAzureStream = exports.isIbmStream = exports.isDailymotionStream = exports.isWowzaStream = exports.isHlsPushStream = exports.isHlsPullStream = exports.isDaCastStream = exports.isSrtStream = exports.isChurchStream = exports.isTwitchStream = exports.isVimeoStream = exports.isYouTubeStream = exports.isWindyStream = exports.isSdCardStream = exports.isRtmpStream = exports.isMpegDvbStream = exports.isFacebookStream = exports.streamListSchema = exports.streamSchema = void 0;
 const zod_1 = require("zod");
 const facebookSchema_1 = require("./facebookSchema");
 const windySchema_1 = require("./windySchema");
@@ -142,3 +142,10 @@ exports.audioLocalSchema = zod_1.z.object({
     name: zod_1.z.string(),
     storage: zod_1.z.enum(['flash', 'SD0']),
 });
+exports.streamStatsSchema = zod_1.z.object({
+    net_stats: zod_1.z.string(),
+    stream_bytes_time_ms: zod_1.z.number(),
+    stream_bytes: zod_1.z.number(),
+    start_count: zod_1.z.number(),
+    is_streaming: zod_1.z.number(),
+});

package/esm/CamStreamerAPI.js

@@ -1,5 +1,5 @@
 import { z } from 'zod';
-import { audioFileListSchema, storageListSchema, streamSchema, } from './types/CamStreamerAPI/CamStreamerAPI';
+import { audioFileListSchema, storageListSchema, streamSchema, streamStatsSchema, } from './types/CamStreamerAPI/CamStreamerAPI';
 import { UtcTimeFetchError, WsAuthorizationError, MigrationError } from './errors/errors';
 import { oldStringStreamSchema, oldStringStreamSchemaWithId, } from './types/CamStreamerAPI/oldStreamSchema';
 import { BasicAPI } from './internal/BasicAPI';
@@ -88,9 +88,9 @@ export class CamStreamerAPI extends BasicAPI {
             stream_id: streamId,
         }, options);
     }
-    async isStreaming(streamId, options) {
+    async getStreamStats(streamId, options) {
         const res = await this._getJson(`${BASE_PATH}/get_streamstat.cgi`, { stream_id: streamId }, options);
-        return res.data.is_streaming === 1;
+        return streamStatsSchema.parse(res.data);
     }
     async setStreamEnabled(streamId, enabled, options) {
         await this._postUrlEncoded(`${BASE_PATH}/set_stream_enabled.cgi`, { stream_id: streamId, enabled: enabled ? 1 : 0 }, options);

package/esm/VapixAPI.js

@@ -1,39 +1,15 @@
-import { arrayToUrl, isNullish, paramToUrl } from './internal/utils';
+import { arrayToUrl, isNullish } from './internal/utils';
 import { sdCardWatchedStatuses, APP_IDS, maxFpsResponseSchema, dateTimeinfoSchema, audioDeviceRequestSchema, audioSampleRatesResponseSchema, timeZoneSchema, getPortsResponseSchema, guardTourSchema, ptzOverviewSchema, cameraPTZItemDataSchema, applicationListSchema, sdCardInfoSchema, } from './types/VapixAPI';
 import { ApplicationAPIError, MaxFPSError, NoDeviceInfoError, PtzNotSupportedError, ErrorWithResponse, SDCardActionError, SDCardJobError, SettingParameterError, TimezoneFetchError, TimezoneNotSetupError, } from './errors/errors';
-import { ProxyClient } from './internal/ProxyClient';
 import { z } from 'zod';
 import { XMLParser } from 'fast-xml-parser';
-export class VapixAPI {
-    client;
+import { BasicAPI } from './internal/BasicAPI';
+export class VapixAPI extends BasicAPI {
     CustomFormData;
     constructor(client, CustomFormData = FormData) {
-        this.client = client;
+        super(client);
         this.CustomFormData = CustomFormData;
     }
-    getClient(proxyParams) {
-        return proxyParams ? new ProxyClient(this.client, proxyParams) : this.client;
-    }
-    async postUrlEncoded(path, parameters, headers, options) {
-        const data = paramToUrl(parameters);
-        const head = { ...headers, 'Content-Type': 'application/x-www-form-urlencoded' };
-        const agent = this.getClient(options?.proxyParams);
-        const res = await agent.post({ path, data, headers: head, timeout: options?.timeout });
-        if (!res.ok) {
-            throw new ErrorWithResponse(res);
-        }
-        return res;
-    }
-    async postJson(path, jsonData, headers, options) {
-        const data = JSON.stringify(jsonData);
-        const head = { ...headers, 'Content-Type': 'application/json' };
-        const agent = this.getClient(options?.proxyParams);
-        const res = await agent.post({ path, data, headers: head, timeout: options?.timeout });
-        if (!res.ok) {
-            throw new ErrorWithResponse(res);
-        }
-        return res;
-    }
     async getCameraImage(parameters, options) {
         const agent = this.getClient(options?.proxyParams);
         return (await agent.get({
@@ -63,7 +39,7 @@ export class VapixAPI {
     async getSupportedAudioSampleRate(options) {
         const path = '/axis-cgi/audio/streamingcapabilities.cgi';
         const jsonData = { apiVersion: '1.0', method: 'list' };
-        const res = await this.postJson(path, jsonData, undefined, options);
+        const res = await this._postJsonEncoded(path, jsonData, undefined, options);
         const encoders = audioSampleRatesResponseSchema.parse(await res.json()).data.encoders;
         const data = encoders.aac ?? encoders.AAC ?? [];
         return data.map((item) => {
@@ -86,19 +62,19 @@ export class VapixAPI {
                     ],
                 },
             };
-            await this.postJson('/axis-cgi/opticscontrol.cgi', data, undefined, options);
+            await this._postJsonEncoded('/axis-cgi/opticscontrol.cgi', data, undefined, options);
         }
         catch (err) {
-            await this.postUrlEncoded('/axis-cgi/opticssetup.cgi', {
+            await this._postUrlEncoded('/axis-cgi/opticssetup.cgi', {
                 autofocus: 'perform',
                 source: '1',
-            }, undefined, options);
+            }, options);
         }
     }
     async checkSDCard(options) {
-        const res = await this.postUrlEncoded('/axis-cgi/disks/list.cgi', {
+        const res = await this._postUrlEncoded('/axis-cgi/disks/list.cgi', {
             diskid: 'SD_DISK',
-        }, undefined, options);
+        }, options);
         const xmlText = await res.text();
         const parser = new XMLParser({
             ignoreAttributes: false,
@@ -120,10 +96,10 @@ export class VapixAPI {
         return this._doSDCardMountAction('UNMOUNT', options);
     }
     async _doSDCardMountAction(action, options) {
-        const res = await this.postUrlEncoded('/axis-cgi/disks/mount.cgi', {
+        const res = await this._postUrlEncoded('/axis-cgi/disks/mount.cgi', {
             action: action,
             diskid: 'SD_DISK',
-        }, undefined, options);
+        }, options);
         const textXml = await res.text();
         const parser = new XMLParser({
             ignoreAttributes: false,
@@ -138,10 +114,10 @@ export class VapixAPI {
         return Number(job.jobid);
     }
     async fetchSDCardJobProgress(jobId, options) {
-        const res = await this.postUrlEncoded('/disks/job.cgi', {
+        const res = await this._postUrlEncoded('/disks/job.cgi', {
             jobid: String(jobId),
             diskid: 'SD_DISK',
-        }, undefined, options);
+        }, options);
         const textXml = await res.text();
         const parser = new XMLParser({
             ignoreAttributes: false,
@@ -155,14 +131,14 @@ export class VapixAPI {
         return Number(job.progress);
     }
     downloadCameraReport(options) {
-        return this.postUrlEncoded('/axis-cgi/serverreport.cgi', { mode: 'text' }, undefined, options);
+        return this._getText('/axis-cgi/serverreport.cgi', { mode: 'text' }, options);
     }
     getSystemLog(options) {
-        return this.postUrlEncoded('/axis-cgi/admin/systemlog.cgi', undefined, undefined, options);
+        return this._postUrlEncoded('/axis-cgi/admin/systemlog.cgi', {}, options);
     }
     async getMaxFps(channel, options) {
         const data = { apiVersion: '1.0', method: 'getCaptureModes' };
-        const res = await this.postJson('/axis-cgi/capturemode.cgi', data, undefined, options);
+        const res = await this._postJsonEncoded('/axis-cgi/capturemode.cgi', data, undefined, options);
         const response = maxFpsResponseSchema.parse(await res.json());
         const channels = response.data;
         if (channels === undefined) {
@@ -208,12 +184,12 @@ export class VapixAPI {
     }
     async getDateTimeInfo(options) {
         const data = { apiVersion: '1.0', method: 'getDateTimeInfo' };
-        const res = await this.postJson('/axis-cgi/time.cgi', data, undefined, options);
+        const res = await this._postJsonEncoded('/axis-cgi/time.cgi', data, undefined, options);
         return dateTimeinfoSchema.parse(await res.json());
     }
     async getDevicesSettings(options) {
         const data = { apiVersion: '1.0', method: 'getDevicesSettings' };
-        const res = await this.postJson('/axis-cgi/audiodevicecontrol.cgi', data, undefined, options);
+        const res = await this._postJsonEncoded('/axis-cgi/audiodevicecontrol.cgi', data, undefined, options);
         const result = audioDeviceRequestSchema.parse(await res.json());
         return result.data.devices.map((device) => ({
             ...device,
@@ -222,7 +198,7 @@ export class VapixAPI {
         }));
     }
     async fetchRemoteDeviceInfo(payload, options) {
-        const res = await this.postJson('/axis-cgi/basicdeviceinfo.cgi', payload, undefined, options);
+        const res = await this._postJsonEncoded('/axis-cgi/basicdeviceinfo.cgi', payload, undefined, options);
         const json = await res.json();
         if (isNullish(json.data)) {
             throw new NoDeviceInfoError();
@@ -231,25 +207,25 @@ export class VapixAPI {
     }
     async getHeaders(options) {
         const data = { apiVersion: '1.0', method: 'list' };
-        const res = await this.postJson('/axis-cgi/customhttpheader.cgi', data, undefined, options);
+        const res = await this._postJsonEncoded('/axis-cgi/customhttpheader.cgi', data, undefined, options);
         return z.object({ data: z.record(z.string()) }).parse(await res.json()).data;
     }
     async setHeaders(headers, options) {
         const data = { apiVersion: '1.0', method: 'set', params: headers };
-        return this.postJson('/axis-cgi/customhttpheader.cgi', data, undefined, options);
+        return this._postJsonEncoded('/axis-cgi/customhttpheader.cgi', data, undefined, options);
     }
     async getParameter(paramNames, options) {
-        const response = await this.postUrlEncoded('/axis-cgi/param.cgi', {
+        const response = await this._postUrlEncoded('/axis-cgi/param.cgi', {
             action: 'list',
             group: arrayToUrl(paramNames),
-        }, undefined, options);
+        }, options);
         return VapixAPI.parseParameters(await response.text());
     }
     async setParameter(params, options) {
-        const res = await this.postUrlEncoded('/axis-cgi/param.cgi', {
+        const res = await this._postUrlEncoded('/axis-cgi/param.cgi', {
             ...params,
             action: 'update',
-        }, undefined, options);
+        }, options);
         const responseText = await res.text();
         if (responseText.startsWith('# Error')) {
             throw new SettingParameterError(responseText);
@@ -297,10 +273,10 @@ export class VapixAPI {
         return this.setParameter(params, options);
     }
     async getPTZPresetList(channel, options) {
-        const res = await this.postUrlEncoded('/axis-cgi/com/ptz.cgi', {
+        const res = await this._postUrlEncoded('/axis-cgi/com/ptz.cgi', {
             query: 'presetposcam',
             camera: channel,
-        }, undefined, options);
+        }, options);
         const text = await res.text();
         const lines = text.split(/[\r\n]/);
         const positions = [];
@@ -317,11 +293,11 @@ export class VapixAPI {
     }
     async listPTZ(camera, options) {
         const url = `/axis-cgi/com/ptz.cgi`;
-        const response = await this.postUrlEncoded(url, {
+        const response = await this._postUrlEncoded(url, {
             camera,
             query: 'presetposcamdata',
             format: 'json',
-        }, undefined, options);
+        }, options);
         const text = await response.text();
         if (text === '') {
             throw new PtzNotSupportedError();
@@ -329,10 +305,10 @@ export class VapixAPI {
         return VapixAPI.parseCameraPtzResponse(text)[camera] ?? [];
     }
     async listPtzVideoSourceOverview(options) {
-        const response = await this.postUrlEncoded('/axis-cgi/com/ptz.cgi', {
+        const response = await this._postUrlEncoded('/axis-cgi/com/ptz.cgi', {
             query: 'presetposall',
             format: 'json',
-        }, undefined, options);
+        }, options);
         const text = await response.text();
         if (text === '') {
             throw new PtzNotSupportedError();
@@ -350,16 +326,16 @@ export class VapixAPI {
         return ptzOverviewSchema.parse(res);
     }
     goToPreset(channel, presetName, options) {
-        return this.postUrlEncoded('/axis-cgi/com/ptz.cgi', {
+        return this._postUrlEncoded('/axis-cgi/com/ptz.cgi', {
             camera: channel.toString(),
             gotoserverpresetname: presetName,
-        }, undefined, options);
+        }, options);
     }
     async getPtzPosition(camera, options) {
-        const res = await this.postUrlEncoded('/axis-cgi/com/ptz.cgi', {
+        const res = await this._postUrlEncoded('/axis-cgi/com/ptz.cgi', {
             query: 'position',
             camera: camera.toString(),
-        }, undefined, options);
+        }, options);
         const params = VapixAPI.parseParameters(await res.text());
         return cameraPTZItemDataSchema.parse({
             pan: Number(params.pan),
@@ -368,7 +344,7 @@ export class VapixAPI {
         });
     }
     async getPorts(options) {
-        const res = await this.postJson('/axis-cgi/io/portmanagement.cgi', {
+        const res = await this._postJsonEncoded('/axis-cgi/io/portmanagement.cgi', {
             apiVersion: '1.0',
             context: '',
             method: 'getPorts',
@@ -377,7 +353,7 @@ export class VapixAPI {
         return portResponseParsed.data.items;
     }
     async setPorts(ports, options) {
-        await this.postJson('/axis-cgi/io/portmanagement.cgi', {
+        await this._postJsonEncoded('/axis-cgi/io/portmanagement.cgi', {
             apiVersion: '1.0',
             context: '',
             method: 'setPorts',
@@ -385,7 +361,7 @@ export class VapixAPI {
         }, undefined, options);
     }
     async setPortStateSequence(port, sequence, options) {
-        await this.postJson('/axis-cgi/io/portmanagement.cgi', {
+        await this._postJsonEncoded('/axis-cgi/io/portmanagement.cgi', {
             apiVersion: '1.0',
             context: '',
             method: 'setStateSequence',
@@ -393,27 +369,27 @@ export class VapixAPI {
         }, undefined, options);
     }
     async addCameraUser(username, pass, sgrp, comment, options) {
-        return await this.postUrlEncoded('/axis-cgi/pwdgrp.cgi', {
+        return await this._postUrlEncoded('/axis-cgi/pwdgrp.cgi', {
             action: 'add',
             user: username,
             pwd: pass,
             grp: 'users',
             sgrp,
             comment,
-        }, undefined, options);
+        }, options);
     }
     async getCameraUsers(options) {
-        const res = await this.postUrlEncoded('/axis-cgi/pwdgrp.cgi', {
+        const res = await this._postUrlEncoded('/axis-cgi/pwdgrp.cgi', {
             action: 'get',
-        }, undefined, options);
+        }, options);
         return await res.text();
     }
     async editCameraUser(username, pass, options) {
-        return await this.postUrlEncoded('/axis-cgi/pwdgrp.cgi', {
+        return await this._postUrlEncoded('/axis-cgi/pwdgrp.cgi', {
             action: 'update',
             user: username,
             pwd: pass,
-        }, undefined, options);
+        }, options);
     }
     async getApplicationList(options) {
         const agent = this.getClient(options?.proxyParams);

package/esm/internal/BasicAPI.js

@@ -64,7 +64,7 @@ export class BasicAPI {
             path,
             data: jsonData,
             parameters,
-            headers: { 'Accept': 'application/json', 'Content-Type': 'application/json' },
+            headers: { 'Content-Type': 'application/json' },
             timeout: options?.timeout,
         });
         if (res.ok) {

package/esm/types/CamStreamerAPI/CamStreamerAPI.js

@@ -119,3 +119,10 @@ export const audioLocalSchema = z.object({
     name: z.string(),
     storage: z.enum(['flash', 'SD0']),
 });
+export const streamStatsSchema = z.object({
+    net_stats: z.string(),
+    stream_bytes_time_ms: z.number(),
+    stream_bytes: z.number(),
+    start_count: z.number(),
+    is_streaming: z.number(),
+});

package/package.json

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

package/types/CamStreamerAPI.d.ts

@@ -2870,7 +2870,13 @@ export declare class CamStreamerAPI<Client extends IClient<TResponse, any>> exte
         streamIdentifier?: string | undefined;
     }>;
     setStream(streamId: string, streamData: TStream, options?: THttpRequestOptions): Promise<void>;
-    isStreaming(streamId: string, options?: THttpRequestOptions): Promise<boolean>;
+    getStreamStats(streamId: number, options?: THttpRequestOptions): Promise<{
+        net_stats: string;
+        stream_bytes_time_ms: number;
+        stream_bytes: number;
+        start_count: number;
+        is_streaming: number;
+    }>;
     setStreamEnabled(streamId: string, enabled: boolean, options?: THttpRequestOptions): Promise<void>;
     setStreamActive(streamId: string, active: boolean, options?: THttpRequestOptions): Promise<void>;
     listFiles(options?: THttpRequestOptions): Promise<{

package/types/VapixAPI.d.ts

@@ -1,17 +1,13 @@
-import { IClient, TParameters, TResponse } from './internal/types';
+import { IClient, TResponse } from './internal/types';
 import { TAudioDevice, TPortSetSchema, TPortSequenceStateSchema } from './types/VapixAPI';
-import { ProxyClient } from './internal/ProxyClient';
-import { TCameraImageConfig, THttpRequestOptions, TProxyParams } from './types/common';
-export declare class VapixAPI<Client extends IClient<TResponse, any>> {
-    private client;
+import { TCameraImageConfig, THttpRequestOptions } from './types/common';
+import { BasicAPI } from './internal/BasicAPI';
+export declare class VapixAPI<Client extends IClient<TResponse, any>> extends BasicAPI<Client> {
     private CustomFormData;
     constructor(client: Client, CustomFormData?: {
         new (form?: HTMLFormElement | undefined, submitter?: HTMLElement | null | undefined): FormData;
         prototype: FormData;
     });
-    getClient(proxyParams?: TProxyParams): Client | ProxyClient<Client>;
-    postUrlEncoded(path: string, parameters?: TParameters, headers?: Record<string, string>, options?: THttpRequestOptions): Promise<TResponse>;
-    postJson(path: string, jsonData: Record<string, any>, headers?: Record<string, string>, options?: THttpRequestOptions): Promise<TResponse>;
     getCameraImage(parameters: TCameraImageConfig, options?: THttpRequestOptions): Promise<ReturnType<Client["get"]>>;
     getEventDeclarations(options?: THttpRequestOptions): Promise<string>;
     getSupportedAudioSampleRate(options?: THttpRequestOptions): Promise<{
@@ -28,7 +24,7 @@ export declare class VapixAPI<Client extends IClient<TResponse, any>> {
     unmountSDCard(options?: THttpRequestOptions): Promise<number>;
     private _doSDCardMountAction;
     fetchSDCardJobProgress(jobId: number, options?: THttpRequestOptions): Promise<number>;
-    downloadCameraReport(options?: THttpRequestOptions): Promise<TResponse>;
+    downloadCameraReport(options?: THttpRequestOptions): Promise<string>;
     getSystemLog(options?: THttpRequestOptions): Promise<TResponse>;
     getMaxFps(channel: number, options?: THttpRequestOptions): Promise<number>;
     getTimezone(options?: THttpRequestOptions): Promise<string>;

package/types/types/CamStreamerAPI/CamStreamerAPI.d.ts

@@ -20256,3 +20256,23 @@ export declare const audioLocalSchema: z.ZodObject<{
     storage: "flash" | "SD0";
 }>;
 export type TAudioLocalType = z.infer<typeof audioLocalSchema>;
+export declare const streamStatsSchema: z.ZodObject<{
+    net_stats: z.ZodString;
+    stream_bytes_time_ms: z.ZodNumber;
+    stream_bytes: z.ZodNumber;
+    start_count: z.ZodNumber;
+    is_streaming: z.ZodNumber;
+}, "strip", z.ZodTypeAny, {
+    net_stats: string;
+    stream_bytes_time_ms: number;
+    stream_bytes: number;
+    start_count: number;
+    is_streaming: number;
+}, {
+    net_stats: string;
+    stream_bytes_time_ms: number;
+    stream_bytes: number;
+    start_count: number;
+    is_streaming: number;
+}>;
+export type TStreamStats = z.infer<typeof streamStatsSchema>;