camstreamerlib 4.0.0-beta.162 → 4.0.0-beta.164

package/esm/VapixAPI.js

@@ -95,65 +95,6 @@ export class VapixAPI extends BasicAPI {
             }, options);
         }
     }
-    async checkSDCard(options) {
-        const res = await this._postUrlEncoded('/axis-cgi/disks/list.cgi', {
-            diskid: 'SD_DISK',
-        }, options);
-        const xmlText = await res.text();
-        const parser = new XMLParser({
-            ignoreAttributes: false,
-            attributeNamePrefix: '',
-            allowBooleanAttributes: true,
-        });
-        const result = parser.parse(xmlText);
-        const data = result.root.disks.disk;
-        return sdCardInfoSchema.parse({
-            totalSize: parseInt(data.totalsize),
-            freeSize: parseInt(data.freesize),
-            status: sdCardWatchedStatuses.includes(data.status) ? data.status : 'disconnected',
-        });
-    }
-    mountSDCard(options) {
-        return this._doSDCardMountAction('MOUNT', options);
-    }
-    unmountSDCard(options) {
-        return this._doSDCardMountAction('UNMOUNT', options);
-    }
-    async _doSDCardMountAction(action, options) {
-        const res = await this._postUrlEncoded('/axis-cgi/disks/mount.cgi', {
-            action: action,
-            diskid: 'SD_DISK',
-        }, options);
-        const textXml = await res.text();
-        const parser = new XMLParser({
-            ignoreAttributes: false,
-            attributeNamePrefix: '',
-            allowBooleanAttributes: true,
-        });
-        const result = parser.parse(textXml);
-        const job = result.root.job;
-        if (job.result !== 'OK') {
-            throw new SDCardActionError(action, job.description);
-        }
-        return Number(job.jobid);
-    }
-    async fetchSDCardJobProgress(jobId, options) {
-        const res = await this._postUrlEncoded('/axis-cgi/disks/job.cgi', {
-            jobid: String(jobId),
-            diskid: 'SD_DISK',
-        }, options);
-        const textXml = await res.text();
-        const parser = new XMLParser({
-            ignoreAttributes: false,
-            attributeNamePrefix: '',
-            allowBooleanAttributes: true,
-        });
-        const job = parser.parse(textXml).root.job;
-        if (job.result !== 'OK') {
-            throw new SDCardJobError(job.description);
-        }
-        return Number(job.progress);
-    }
     downloadCameraReport(options) {
         return this._getText('/axis-cgi/serverreport.cgi', { mode: 'text' }, options);
     }
@@ -239,6 +180,65 @@ export class VapixAPI extends BasicAPI {
         const data = { apiVersion: '1.0', method: 'set', params: headers };
         await this._postJsonEncoded('/axis-cgi/customhttpheader.cgi', data, undefined, options);
     }
+    async checkSDCard(options) {
+        const res = await this._postUrlEncoded('/axis-cgi/disks/list.cgi', {
+            diskid: 'SD_DISK',
+        }, options);
+        const xmlText = await res.text();
+        const parser = new XMLParser({
+            ignoreAttributes: false,
+            attributeNamePrefix: '',
+            allowBooleanAttributes: true,
+        });
+        const result = parser.parse(xmlText);
+        const data = result.root.disks.disk;
+        return sdCardInfoSchema.parse({
+            totalSize: parseInt(data.totalsize),
+            freeSize: parseInt(data.freesize),
+            status: sdCardWatchedStatuses.includes(data.status) ? data.status : 'disconnected',
+        });
+    }
+    mountSDCard(options) {
+        return this._doSDCardMountAction('MOUNT', options);
+    }
+    unmountSDCard(options) {
+        return this._doSDCardMountAction('UNMOUNT', options);
+    }
+    async _doSDCardMountAction(action, options) {
+        const res = await this._postUrlEncoded('/axis-cgi/disks/mount.cgi', {
+            action: action,
+            diskid: 'SD_DISK',
+        }, options);
+        const textXml = await res.text();
+        const parser = new XMLParser({
+            ignoreAttributes: false,
+            attributeNamePrefix: '',
+            allowBooleanAttributes: true,
+        });
+        const result = parser.parse(textXml);
+        const job = result.root.job;
+        if (job.result !== 'OK') {
+            throw new SDCardActionError(action, job.description);
+        }
+        return Number(job.jobid);
+    }
+    async fetchSDCardJobProgress(jobId, options) {
+        const res = await this._postUrlEncoded('/disks/job.cgi', {
+            jobid: String(jobId),
+            diskid: 'SD_DISK',
+        }, options);
+        const textXml = await res.text();
+        const parser = new XMLParser({
+            ignoreAttributes: false,
+            attributeNamePrefix: '',
+            allowBooleanAttributes: true,
+        });
+        const job = parser.parse(textXml).root.job;
+        if (job.result !== 'OK') {
+            throw new SDCardJobError(job.description);
+        }
+        return Number(job.progress);
+    }
     async getParameter(paramNames, options) {
         const response = await this._postUrlEncoded('/axis-cgi/param.cgi', {
             action: 'list',

package/esm/types/CamStreamerAPI/streamCommonTypes.js

@@ -5,6 +5,7 @@ export const streamCommonSchema = z.object({
     enabled: z.boolean(),
     active: z.boolean(),
     title: z.string(),
+    callApi: z.boolean(),
     trigger: z.discriminatedUnion('type', [
         z.object({
             type: z.literal('manual'),

package/package.json

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

package/types/CamStreamerAPI.d.ts

@@ -31,6 +31,7 @@ export declare class CamStreamerAPI<Client extends IClient<TResponse, any>> exte
         enabled: boolean;
         active: boolean;
         title: string;
+        callApi: boolean;
         trigger: {
             type: "manual";
             port?: number | undefined;
@@ -120,6 +121,7 @@ export declare class CamStreamerAPI<Client extends IClient<TResponse, any>> exte
         enabled: boolean;
         active: boolean;
         title: string;
+        callApi: boolean;
         trigger: {
             type: "manual";
             port?: number | undefined;
@@ -214,6 +216,7 @@ export declare class CamStreamerAPI<Client extends IClient<TResponse, any>> exte
         enabled: boolean;
         active: boolean;
         title: string;
+        callApi: boolean;
         trigger: {
             type: "manual";
             port?: number | undefined;
@@ -311,6 +314,7 @@ export declare class CamStreamerAPI<Client extends IClient<TResponse, any>> exte
         enabled: boolean;
         active: boolean;
         title: string;
+        callApi: boolean;
         trigger: {
             type: "manual";
             port?: number | undefined;
@@ -397,6 +401,7 @@ export declare class CamStreamerAPI<Client extends IClient<TResponse, any>> exte
         enabled: boolean;
         active: boolean;
         title: string;
+        callApi: boolean;
         trigger: {
             type: "manual";
             port?: number | undefined;
@@ -483,6 +488,7 @@ export declare class CamStreamerAPI<Client extends IClient<TResponse, any>> exte
         enabled: boolean;
         active: boolean;
         title: string;
+        callApi: boolean;
         trigger: {
             type: "manual";
             port?: number | undefined;
@@ -569,6 +575,7 @@ export declare class CamStreamerAPI<Client extends IClient<TResponse, any>> exte
         enabled: boolean;
         active: boolean;
         title: string;
+        callApi: boolean;
         trigger: {
             type: "manual";
             port?: number | undefined;
@@ -655,6 +662,7 @@ export declare class CamStreamerAPI<Client extends IClient<TResponse, any>> exte
         enabled: boolean;
         active: boolean;
         title: string;
+        callApi: boolean;
         trigger: {
             type: "manual";
             port?: number | undefined;
@@ -741,6 +749,7 @@ export declare class CamStreamerAPI<Client extends IClient<TResponse, any>> exte
         enabled: boolean;
         active: boolean;
         title: string;
+        callApi: boolean;
         trigger: {
             type: "manual";
             port?: number | undefined;
@@ -827,6 +836,7 @@ export declare class CamStreamerAPI<Client extends IClient<TResponse, any>> exte
         enabled: boolean;
         active: boolean;
         title: string;
+        callApi: boolean;
         trigger: {
             type: "manual";
             port?: number | undefined;
@@ -913,6 +923,7 @@ export declare class CamStreamerAPI<Client extends IClient<TResponse, any>> exte
         enabled: boolean;
         active: boolean;
         title: string;
+        callApi: boolean;
         trigger: {
             type: "manual";
             port?: number | undefined;
@@ -999,6 +1010,7 @@ export declare class CamStreamerAPI<Client extends IClient<TResponse, any>> exte
         enabled: boolean;
         active: boolean;
         title: string;
+        callApi: boolean;
         trigger: {
             type: "manual";
             port?: number | undefined;
@@ -1085,6 +1097,7 @@ export declare class CamStreamerAPI<Client extends IClient<TResponse, any>> exte
         enabled: boolean;
         active: boolean;
         title: string;
+        callApi: boolean;
         trigger: {
             type: "manual";
             port?: number | undefined;
@@ -1171,6 +1184,7 @@ export declare class CamStreamerAPI<Client extends IClient<TResponse, any>> exte
         enabled: boolean;
         active: boolean;
         title: string;
+        callApi: boolean;
         trigger: {
             type: "manual";
             port?: number | undefined;
@@ -1257,6 +1271,7 @@ export declare class CamStreamerAPI<Client extends IClient<TResponse, any>> exte
         enabled: boolean;
         active: boolean;
         title: string;
+        callApi: boolean;
         trigger: {
             type: "manual";
             port?: number | undefined;
@@ -1343,6 +1358,7 @@ export declare class CamStreamerAPI<Client extends IClient<TResponse, any>> exte
         enabled: boolean;
         active: boolean;
         title: string;
+        callApi: boolean;
         trigger: {
             type: "manual";
             port?: number | undefined;
@@ -1429,6 +1445,7 @@ export declare class CamStreamerAPI<Client extends IClient<TResponse, any>> exte
         enabled: boolean;
         active: boolean;
         title: string;
+        callApi: boolean;
         trigger: {
             type: "manual";
             port?: number | undefined;
@@ -1515,6 +1532,7 @@ export declare class CamStreamerAPI<Client extends IClient<TResponse, any>> exte
         enabled: boolean;
         active: boolean;
         title: string;
+        callApi: boolean;
         trigger: {
             type: "manual";
             port?: number | undefined;
@@ -1601,6 +1619,7 @@ export declare class CamStreamerAPI<Client extends IClient<TResponse, any>> exte
         enabled: boolean;
         active: boolean;
         title: string;
+        callApi: boolean;
         trigger: {
             type: "manual";
             port?: number | undefined;
@@ -1687,6 +1706,7 @@ export declare class CamStreamerAPI<Client extends IClient<TResponse, any>> exte
         enabled: boolean;
         active: boolean;
         title: string;
+        callApi: boolean;
         trigger: {
             type: "manual";
             port?: number | undefined;
@@ -1784,6 +1804,7 @@ export declare class CamStreamerAPI<Client extends IClient<TResponse, any>> exte
         enabled: boolean;
         active: boolean;
         title: string;
+        callApi: boolean;
         trigger: {
             type: "manual";
             port?: number | undefined;
@@ -1873,6 +1894,7 @@ export declare class CamStreamerAPI<Client extends IClient<TResponse, any>> exte
         enabled: boolean;
         active: boolean;
         title: string;
+        callApi: boolean;
         trigger: {
             type: "manual";
             port?: number | undefined;
@@ -1967,6 +1989,7 @@ export declare class CamStreamerAPI<Client extends IClient<TResponse, any>> exte
         enabled: boolean;
         active: boolean;
         title: string;
+        callApi: boolean;
         trigger: {
             type: "manual";
             port?: number | undefined;
@@ -2064,6 +2087,7 @@ export declare class CamStreamerAPI<Client extends IClient<TResponse, any>> exte
         enabled: boolean;
         active: boolean;
         title: string;
+        callApi: boolean;
         trigger: {
             type: "manual";
             port?: number | undefined;
@@ -2150,6 +2174,7 @@ export declare class CamStreamerAPI<Client extends IClient<TResponse, any>> exte
         enabled: boolean;
         active: boolean;
         title: string;
+        callApi: boolean;
         trigger: {
             type: "manual";
             port?: number | undefined;
@@ -2236,6 +2261,7 @@ export declare class CamStreamerAPI<Client extends IClient<TResponse, any>> exte
         enabled: boolean;
         active: boolean;
         title: string;
+        callApi: boolean;
         trigger: {
             type: "manual";
             port?: number | undefined;
@@ -2322,6 +2348,7 @@ export declare class CamStreamerAPI<Client extends IClient<TResponse, any>> exte
         enabled: boolean;
         active: boolean;
         title: string;
+        callApi: boolean;
         trigger: {
             type: "manual";
             port?: number | undefined;
@@ -2408,6 +2435,7 @@ export declare class CamStreamerAPI<Client extends IClient<TResponse, any>> exte
         enabled: boolean;
         active: boolean;
         title: string;
+        callApi: boolean;
         trigger: {
             type: "manual";
             port?: number | undefined;
@@ -2494,6 +2522,7 @@ export declare class CamStreamerAPI<Client extends IClient<TResponse, any>> exte
         enabled: boolean;
         active: boolean;
         title: string;
+        callApi: boolean;
         trigger: {
             type: "manual";
             port?: number | undefined;
@@ -2580,6 +2609,7 @@ export declare class CamStreamerAPI<Client extends IClient<TResponse, any>> exte
         enabled: boolean;
         active: boolean;
         title: string;
+        callApi: boolean;
         trigger: {
             type: "manual";
             port?: number | undefined;
@@ -2666,6 +2696,7 @@ export declare class CamStreamerAPI<Client extends IClient<TResponse, any>> exte
         enabled: boolean;
         active: boolean;
         title: string;
+        callApi: boolean;
         trigger: {
             type: "manual";
             port?: number | undefined;
@@ -2752,6 +2783,7 @@ export declare class CamStreamerAPI<Client extends IClient<TResponse, any>> exte
         enabled: boolean;
         active: boolean;
         title: string;
+        callApi: boolean;
         trigger: {
             type: "manual";
             port?: number | undefined;
@@ -2838,6 +2870,7 @@ export declare class CamStreamerAPI<Client extends IClient<TResponse, any>> exte
         enabled: boolean;
         active: boolean;
         title: string;
+        callApi: boolean;
         trigger: {
             type: "manual";
             port?: number | undefined;
@@ -2924,6 +2957,7 @@ export declare class CamStreamerAPI<Client extends IClient<TResponse, any>> exte
         enabled: boolean;
         active: boolean;
         title: string;
+        callApi: boolean;
         trigger: {
             type: "manual";
             port?: number | undefined;
@@ -3010,6 +3044,7 @@ export declare class CamStreamerAPI<Client extends IClient<TResponse, any>> exte
         enabled: boolean;
         active: boolean;
         title: string;
+        callApi: boolean;
         trigger: {
             type: "manual";
             port?: number | undefined;
@@ -3096,6 +3131,7 @@ export declare class CamStreamerAPI<Client extends IClient<TResponse, any>> exte
         enabled: boolean;
         active: boolean;
         title: string;
+        callApi: boolean;
         trigger: {
             type: "manual";
             port?: number | undefined;
@@ -3182,6 +3218,7 @@ export declare class CamStreamerAPI<Client extends IClient<TResponse, any>> exte
         enabled: boolean;
         active: boolean;
         title: string;
+        callApi: boolean;
         trigger: {
             type: "manual";
             port?: number | undefined;
@@ -3268,6 +3305,7 @@ export declare class CamStreamerAPI<Client extends IClient<TResponse, any>> exte
         enabled: boolean;
         active: boolean;
         title: string;
+        callApi: boolean;
         trigger: {
             type: "manual";
             port?: number | undefined;
@@ -3354,6 +3392,7 @@ export declare class CamStreamerAPI<Client extends IClient<TResponse, any>> exte
         enabled: boolean;
         active: boolean;
         title: string;
+        callApi: boolean;
         trigger: {
             type: "manual";
             port?: number | undefined;
@@ -3440,6 +3479,7 @@ export declare class CamStreamerAPI<Client extends IClient<TResponse, any>> exte
         enabled: boolean;
         active: boolean;
         title: string;
+        callApi: boolean;
         trigger: {
             type: "manual";
             port?: number | undefined;

package/types/VapixAPI.d.ts

@@ -17,15 +17,6 @@ export declare class VapixAPI<Client extends IClient<TResponse, any>> extends Ba
         bitRates: number[];
     }[]>;
     performAutofocus(options?: THttpRequestOptions): Promise<void>;
-    checkSDCard(options?: THttpRequestOptions): Promise<{
-        status: "OK" | "connected" | "disconnected";
-        totalSize: number;
-        freeSize: number;
-    }>;
-    mountSDCard(options?: THttpRequestOptions): Promise<number>;
-    unmountSDCard(options?: THttpRequestOptions): Promise<number>;
-    private _doSDCardMountAction;
-    fetchSDCardJobProgress(jobId: number, options?: THttpRequestOptions): Promise<number>;
     downloadCameraReport(options?: THttpRequestOptions): Promise<string>;
     getSystemLog(options?: THttpRequestOptions): Promise<string>;
     getMaxFps(channel: number, options?: THttpRequestOptions): Promise<number>;
@@ -43,6 +34,15 @@ export declare class VapixAPI<Client extends IClient<TResponse, any>> extends Ba
     fetchRemoteDeviceInfo<T extends Record<string, any>>(payload: T, options?: THttpRequestOptions): Promise<any>;
     getHeaders(options?: THttpRequestOptions): Promise<Record<string, string>>;
     setHeaders(headers: Record<string, string>, options?: THttpRequestOptions): Promise<void>;
+    checkSDCard(options?: THttpRequestOptions): Promise<{
+        status: "OK" | "connected" | "disconnected";
+        totalSize: number;
+        freeSize: number;
+    }>;
+    mountSDCard(options?: THttpRequestOptions): Promise<number>;
+    unmountSDCard(options?: THttpRequestOptions): Promise<number>;
+    private _doSDCardMountAction;
+    fetchSDCardJobProgress(jobId: number, options?: THttpRequestOptions): Promise<number>;
     getParameter(paramNames: string | string[], options?: THttpRequestOptions): Promise<Record<string, string>>;
     setParameter(params: Record<string, string | number | boolean>, options?: THttpRequestOptions): Promise<void>;
     getGuardTourList(options?: THttpRequestOptions): Promise<{