camstreamerlib 4.0.0-beta.30 → 4.0.0-beta.32

package/esm/PlaneTrackerAPI.js

@@ -11,12 +11,15 @@ export class PlaneTrackerAPI {
         this.apiUser = apiUser;
     }
     static getProxyUrlPath = () => `${BASE_PATH}/proxy.cgi`;
+    getClient(proxyParams) {
+        return proxyParams ? new ProxyClient(this.client, proxyParams) : this.client;
+    }
     async checkCameraTime(options) {
         const response = await this._getJson(`${BASE_PATH}/camera_time.cgi`, undefined, options);
         return z.boolean().parse(response.state);
     }
     resetPtzCalibration = async (options) => {
-        const agent = this.getAgent(options?.proxyParams);
+        const agent = this.getClient(options?.proxyParams);
         return await agent.get({
             path: `${BASE_PATH}/package/resetPtzCalibration.cgi`,
             parameters: this.apiUser,
@@ -24,7 +27,7 @@ export class PlaneTrackerAPI {
         });
     };
     resetFocusCalibration = async (options) => {
-        const agent = this.getAgent(options?.proxyParams);
+        const agent = this.getClient(options?.proxyParams);
         return await agent.get({
             path: `${BASE_PATH}/package/resetFocusCalibration.cgi`,
             parameters: this.apiUser,
@@ -32,11 +35,11 @@ export class PlaneTrackerAPI {
         });
     };
     serverRunCheck = async (options) => {
-        const agent = this.getAgent(options?.proxyParams);
+        const agent = this.getClient(options?.proxyParams);
         return await agent.get({ path: `${BASE_PATH}/package/serverRunCheck.cgi`, timeout: options?.timeout });
     };
     getLiveViewAlias = async (rtspUrl, options) => {
-        const agent = this.getAgent(options?.proxyParams);
+        const agent = this.getClient(options?.proxyParams);
         return await agent.get({
             path: `${BASE_PATH}/getLiveViewAlias.cgi`,
             parameters: { rtsp_url: rtspUrl },
@@ -58,7 +61,7 @@ export class PlaneTrackerAPI {
         return await this._getBlob(`${BASE_PATH}/package_data.cgi`, { action: 'EXPORT', dataType }, options);
     };
     importAppSettings = async (dataType, formData, options) => {
-        const agent = this.getAgent(options?.proxyParams);
+        const agent = this.getClient(options?.proxyParams);
         return await agent.post({
             path: `${BASE_PATH}/package_data.cgi`,
             data: formData,
@@ -76,7 +79,7 @@ export class PlaneTrackerAPI {
         return await this._postJsonEncoded(`${BASE_PATH}/package/setTrackingMode.cgi`, modeJsonString, this.apiUser, options);
     };
     startTrackingPlane = async (icao, options) => {
-        const agent = this.getAgent(options?.proxyParams);
+        const agent = this.getClient(options?.proxyParams);
         return await agent.get({
             path: `${BASE_PATH}/package/trackIcao.cgi`,
             parameters: { icao, ...this.apiUser },
@@ -84,7 +87,7 @@ export class PlaneTrackerAPI {
         });
     };
     stopTrackingPlane = async (options) => {
-        const agent = this.getAgent(options?.proxyParams);
+        const agent = this.getClient(options?.proxyParams);
         return await agent.get({
             path: `${BASE_PATH}/package/resetIcao.cgi`,
             parameters: this.apiUser,
@@ -119,7 +122,7 @@ export class PlaneTrackerAPI {
         return await this._postJsonEncoded(`${BASE_PATH}/package/setZones.cgi`, zonesJsonString, this.apiUser, options);
     };
     goToCoordinates = async (lat, lon, alt, options) => {
-        const agent = this.getAgent(options?.proxyParams);
+        const agent = this.getClient(options?.proxyParams);
         return await agent.get({
             path: `${BASE_PATH}/package/goToCoordinates.cgi`,
             parameters: { lat, lon, alt, ...this.apiUser },
@@ -134,7 +137,7 @@ export class PlaneTrackerAPI {
         return await res.json();
     };
     async _getJson(path, parameters, options) {
-        const agent = this.getAgent(options?.proxyParams);
+        const agent = this.getClient(options?.proxyParams);
         const res = await agent.get({
             path,
             parameters,
@@ -148,7 +151,7 @@ export class PlaneTrackerAPI {
         }
     }
     async _getBlob(path, parameters, options) {
-        const agent = this.getAgent(options?.proxyParams);
+        const agent = this.getClient(options?.proxyParams);
         const res = await agent.get({
             path,
             parameters,
@@ -170,7 +173,7 @@ export class PlaneTrackerAPI {
         }
     }
     async _postJsonEncoded(path, data, parameters, options) {
-        const agent = this.getAgent(options?.proxyParams);
+        const agent = this.getClient(options?.proxyParams);
         const res = await agent.post({
             path,
             data,
@@ -187,7 +190,7 @@ export class PlaneTrackerAPI {
     }
     async _postUrlEncoded(path, params, options) {
         const data = paramToUrl(params);
-        const agent = this.getAgent(options?.proxyParams);
+        const agent = this.getClient(options?.proxyParams);
         const res = await agent.post({
             path,
             data,
@@ -201,7 +204,4 @@ export class PlaneTrackerAPI {
             throw new Error(await responseStringify(res));
         }
     }
-    getAgent(proxyParams) {
-        return proxyParams ? new ProxyClient(this.client, proxyParams) : this.client;
-    }
 }

package/esm/VapixAPI.d.ts

@@ -1,9 +1,11 @@
 import { IClient, TParameters, TResponse } from './internal/types';
 import { TAudioSampleRates, TSDCardInfo, TPtzOverview, TCameraPTZItem, TCameraPTZItemData, TAudioDevice, TPortSetSchema, TPortSequenceStateSchema } from './types/VapixAPI';
-import { TCameraImageConfig, THttpRequestOptions } from './types/common';
+import { ProxyClient } from './internal/ProxyClient';
+import { TCameraImageConfig, THttpRequestOptions, TProxyParams } from './types/common';
 export declare class VapixAPI<Client extends IClient<TResponse> = IClient<TResponse>> {
     private client;
     constructor(client: Client);
+    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<TResponse>;
@@ -75,5 +77,4 @@ export declare class VapixAPI<Client extends IClient<TResponse> = IClient<TRespo
     private static parseParameters;
     private static parseCameraPtzResponse;
     private static parsePtz;
-    private getAgent;
 }

package/esm/VapixAPI.js

@@ -10,10 +10,13 @@ export class VapixAPI {
     constructor(client) {
         this.client = client;
     }
+    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.getAgent(options?.proxyParams);
+        const agent = this.getClient(options?.proxyParams);
         const res = await agent.post({ path, data, headers: head, timeout: options?.timeout });
         if (!res.ok) {
             throw new Error(await responseStringify(res));
@@ -23,7 +26,7 @@ export class VapixAPI {
     async postJson(path, jsonData, headers, options) {
         const data = JSON.stringify(jsonData);
         const head = { ...headers, 'Content-Type': 'application/json' };
-        const agent = this.getAgent(options?.proxyParams);
+        const agent = this.getClient(options?.proxyParams);
         const res = await agent.post({ path, data, headers: head, timeout: options?.timeout });
         if (!res.ok) {
             throw new Error(await responseStringify(res));
@@ -31,7 +34,7 @@ export class VapixAPI {
         return res;
     }
     async getCameraImage(parameters, options) {
-        const agent = this.getAgent(options?.proxyParams);
+        const agent = this.getClient(options?.proxyParams);
         return await agent.get({ path: '/axis-cgi/jpg/image.cgi', parameters, timeout: options?.timeout });
     }
     async getEventDeclarations(options) {
@@ -41,7 +44,7 @@ export class VapixAPI {
             '<GetEventInstances xmlns="http://www.axis.com/vapix/ws/event1"/>' +
             '</s:Body>' +
             '</s:Envelope>';
-        const agent = this.getAgent(options?.proxyParams);
+        const agent = this.getClient(options?.proxyParams);
         const res = await agent.post({
             path: '/vapix/services',
             data,
@@ -177,7 +180,7 @@ export class VapixAPI {
     }
     async getTimezone(options) {
         try {
-            const agent = this.getAgent(options?.proxyParams);
+            const agent = this.getClient(options?.proxyParams);
             const resV2 = await agent.get({ path: '/config/rest/time/v2/timeZone', timeout: options?.timeout });
             if (!resV2.ok) {
                 throw new Error(await responseStringify(resV2));
@@ -386,7 +389,7 @@ export class VapixAPI {
         }, undefined, options);
     }
     async getApplicationList(options) {
-        const agent = this.getAgent(options?.proxyParams);
+        const agent = this.getClient(options?.proxyParams);
         const res = await agent.get({ path: '/axis-cgi/applications/list.cgi', timeout: options?.timeout });
         const xml = await res.text();
         const parser = new XMLParser({
@@ -407,7 +410,7 @@ export class VapixAPI {
         });
     }
     async startApplication(applicationID, options) {
-        const agent = this.getAgent(options?.proxyParams);
+        const agent = this.getClient(options?.proxyParams);
         const res = await agent.get({
             path: '/axis-cgi/applications/control.cgi',
             parameters: {
@@ -422,7 +425,7 @@ export class VapixAPI {
         }
     }
     async restartApplication(applicationID, options) {
-        const agent = this.getAgent(options?.proxyParams);
+        const agent = this.getClient(options?.proxyParams);
         const res = await agent.get({
             path: '/axis-cgi/applications/control.cgi',
             parameters: {
@@ -437,7 +440,7 @@ export class VapixAPI {
         }
     }
     async stopApplication(applicationID, options) {
-        const agent = this.getAgent(options?.proxyParams);
+        const agent = this.getClient(options?.proxyParams);
         const res = await agent.get({
             path: '/axis-cgi/applications/control.cgi',
             parameters: {
@@ -454,7 +457,7 @@ export class VapixAPI {
     async installApplication(data, fileName, options) {
         const formData = new FormData();
         formData.append('packfil', data, fileName);
-        const agent = this.getAgent(options?.proxyParams);
+        const agent = this.getClient(options?.proxyParams);
         const res = await agent.post({
             path: '/axis-cgi/applications/upload.cgi',
             data: formData,
@@ -537,7 +540,4 @@ export class VapixAPI {
         });
         return res;
     };
-    getAgent(proxyParams) {
-        return proxyParams ? new ProxyClient(this.client, proxyParams) : this.client;
-    }
 }

package/esm/events/AxisCameraStationEvents.d.ts

@@ -1,10 +1,12 @@
 import { HttpOptions } from '../internal/types';
-import { THttpRequestOptions } from '../types/common';
+import { THttpRequestOptions, TProxyParams } from '../types/common';
+import { ProxyClient } from '../internal/ProxyClient';
+import { DefaultClient } from '../node';
 export declare class AxisCameraStationEvents {
     private sourceKey;
     private client;
     constructor(clientOptions: HttpOptions, sourceKey: string);
+    getClient(proxyParams?: TProxyParams): DefaultClient | ProxyClient<DefaultClient>;
     sendEvent(data: Record<string, string>, eventType: string, options?: THttpRequestOptions): Promise<void>;
     private getDate;
-    private getAgent;
 }

package/esm/events/AxisCameraStationEvents.js

@@ -8,6 +8,9 @@ export class AxisCameraStationEvents {
         this.sourceKey = sourceKey;
         this.client = new DefaultClient(clientOptions);
     }
+    getClient(proxyParams) {
+        return proxyParams ? new ProxyClient(this.client, proxyParams) : this.client;
+    }
     async sendEvent(data, eventType, options) {
         const dateString = this.getDate();
         const event = {
@@ -19,7 +22,7 @@ export class AxisCameraStationEvents {
             },
         };
         const eventData = JSON.stringify(event);
-        const agent = this.getAgent(options?.proxyParams);
+        const agent = this.getClient(options?.proxyParams);
         const res = await agent.post({
             path: '/Acs/Api/ExternalDataFacade/AddExternalData',
             data: eventData,
@@ -43,7 +46,4 @@ export class AxisCameraStationEvents {
         const seconds = pad(date.getUTCSeconds(), 2);
         return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
     }
-    getAgent(proxyParams) {
-        return proxyParams ? new ProxyClient(this.client, proxyParams) : this.client;
-    }
 }

package/esm/index.d.ts

@@ -14,7 +14,6 @@ export * from './types/CamSwitcherEvents';
 export * from './types/CamSwitcherAPI';
 export * from './types/VapixAPI';
 export * from './types/CamOverlayAPI';
-export * from './types/CamOverlayAPI/CamOverlayAPI';
 export * from './types/PlaneTrackerAPI';
 export { Frame } from './CamOverlayPainter/Frame';
 export { Painter } from './CamOverlayPainter/Painter';

package/esm/index.js

@@ -14,7 +14,6 @@ export * from './types/CamSwitcherEvents';
 export * from './types/CamSwitcherAPI';
 export * from './types/VapixAPI';
 export * from './types/CamOverlayAPI';
-export * from './types/CamOverlayAPI/CamOverlayAPI';
 export * from './types/PlaneTrackerAPI';
 export { Frame } from './CamOverlayPainter/Frame';
 export { Painter } from './CamOverlayPainter/Painter';