camstreamerlib 4.0.0-beta.44 → 4.0.0-beta.46

package/cjs/PlaneTrackerAPI.js

@@ -23,6 +23,19 @@ class PlaneTrackerAPI {
         const res = await this._getJson(`${BASE_PATH}/camera_time.cgi`, undefined, options);
         return zod_1.z.boolean().parse(res.state);
     }
+    async serverRunCheck(options) {
+        const agent = this.getClient(options?.proxyParams);
+        return await agent.get({ path: `${BASE_PATH}/package/serverRunCheck.cgi`, timeout: options?.timeout });
+    }
+    async getLiveViewAlias(rtspUrl, options) {
+        const agent = this.getClient(options?.proxyParams);
+        const res = await agent.get({
+            path: `${BASE_PATH}/getLiveViewAlias.cgi`,
+            parameters: { rtsp_url: rtspUrl },
+            timeout: options?.timeout,
+        });
+        return PlaneTrackerAPI_1.wsAliasResponseSchema.parse(await res.json());
+    }
     async resetPtzCalibration(options) {
         const agent = this.getClient(options?.proxyParams);
         const res = await agent.get({
@@ -45,19 +58,6 @@ class PlaneTrackerAPI {
             throw new errors_1.ResetCalibrationError('FOCUS', await (0, utils_1.responseStringify)(res));
         }
     }
-    async serverRunCheck(options) {
-        const agent = this.getClient(options?.proxyParams);
-        return await agent.get({ path: `${BASE_PATH}/package/serverRunCheck.cgi`, timeout: options?.timeout });
-    }
-    async getLiveViewAlias(rtspUrl, options) {
-        const agent = this.getClient(options?.proxyParams);
-        const res = await agent.get({
-            path: `${BASE_PATH}/getLiveViewAlias.cgi`,
-            parameters: { rtsp_url: rtspUrl },
-            timeout: options?.timeout,
-        });
-        return PlaneTrackerAPI_1.wsAliasResponseSchema.parse(await res.json());
-    }
     async fetchCameraSettings(options) {
         const res = await this._getJson(`${BASE_PATH}/package_camera_settings.cgi`, { action: 'get' }, options);
         return PlaneTrackerAPI_1.cameraSettingsSchema.parse(res);
@@ -95,7 +95,7 @@ class PlaneTrackerAPI {
         return PlaneTrackerAPI_1.trackingModeSchema.parse(res);
     }
     async setTrackingMode(mode, options) {
-        await this._postJsonEncoded(`${BASE_PATH}/package/setTrackingMode.cgi`, { mode: mode }, this.apiUser, options);
+        await this._postJsonEncoded(`${BASE_PATH}/package/setTrackingMode.cgi`, { mode }, this.apiUser, options);
     }
     async startTrackingPlane(icao, options) {
         const agent = this.getClient(options?.proxyParams);
@@ -118,21 +118,21 @@ class PlaneTrackerAPI {
         return PlaneTrackerAPI_1.priorityListSchema.parse(res);
     }
     async setPriorityList(priorityList, options) {
-        return await this._postJsonEncoded(`${BASE_PATH}/package/setPriorityList.cgi`, { priorityList: priorityList }, this.apiUser, options);
+        return await this._postJsonEncoded(`${BASE_PATH}/package/setPriorityList.cgi`, { priorityList }, this.apiUser, options);
     }
     async getWhiteList(options) {
         const res = await this._getJson(`${BASE_PATH}/package/getWhiteList.cgi`, undefined, options);
         return PlaneTrackerAPI_1.whiteListSchema.parse(res);
     }
     async setWhiteList(whiteList, options) {
-        return await this._postJsonEncoded(`${BASE_PATH}/package/setWhiteList.cgi`, { whiteList: whiteList }, this.apiUser, options);
+        return await this._postJsonEncoded(`${BASE_PATH}/package/setWhiteList.cgi`, { whiteList }, this.apiUser, options);
     }
     async getBlackList(options) {
         const res = await this._getJson(`${BASE_PATH}/package/getBlackList.cgi`, undefined, options);
         return PlaneTrackerAPI_1.blackListSchema.parse(res);
     }
     async setBlackList(blackList, options) {
-        return await this._postJsonEncoded(`${BASE_PATH}/package/setBlackList.cgi`, { blackList: blackList }, this.apiUser, options);
+        return await this._postJsonEncoded(`${BASE_PATH}/package/setBlackList.cgi`, { blackList }, this.apiUser, options);
     }
     async fetchMapInfo(options) {
         const res = await this._getJson(`${BASE_PATH}/package/getMapInfo.cgi`, undefined, options);
@@ -158,7 +158,7 @@ class PlaneTrackerAPI {
     }
     async getGenetecCameraList(params, options) {
         const res = await this._postUrlEncoded(`${BASE_PATH}/package/getGenetecCameraList.cgi`, params, options);
-        return GenetecAgent_1.cameraListSchema.parse(res);
+        return GenetecAgent_1.cameraListSchema.parse(await res.json());
     }
     async _getJson(path, parameters, options, headers) {
         const agent = this.getClient(options?.proxyParams);
@@ -170,16 +170,6 @@ class PlaneTrackerAPI {
             throw new Error(await (0, utils_1.responseStringify)(res));
         }
     }
-    async _post(path, data, parameters, options, headers) {
-        const agent = this.getClient(options?.proxyParams);
-        const res = await agent.post({ path, data, parameters, headers, timeout: options?.timeout });
-        if (res.ok) {
-            return await res.json();
-        }
-        else {
-            throw new Error(await (0, utils_1.responseStringify)(res));
-        }
-    }
     async _getBlob(path, parameters, options) {
         const agent = this.getClient(options?.proxyParams);
         const res = await agent.get({ path, parameters, timeout: options?.timeout });
@@ -198,15 +188,38 @@ class PlaneTrackerAPI {
             throw new errors_1.ParsingBlobError(err);
         }
     }
-    async _postUrlEncoded(path, parameters, options, headers) {
-        const baseHeaders = { 'Content-Type': 'application/x-www-form-urlencoded' };
-        const data = (0, utils_1.paramToUrl)(parameters);
-        return this._post(path, data, {}, options, { ...baseHeaders, ...headers });
-    }
-    async _postJsonEncoded(path, data, parameters, options, headers) {
-        const baseHeaders = { 'Accept': 'application/json', 'Content-Type': 'application/json' };
+    async _postJsonEncoded(path, data, parameters, options) {
+        const agent = this.getClient(options?.proxyParams);
         const jsonData = JSON.stringify(data);
-        return this._post(path, jsonData, parameters, options, { ...baseHeaders, ...headers });
+        const res = await agent.post({
+            path,
+            data: jsonData,
+            parameters,
+            headers: { 'Accept': 'application/json', 'Content-Type': 'application/json' },
+            timeout: options?.timeout,
+        });
+        if (res.ok) {
+            return res;
+        }
+        else {
+            throw new Error(await (0, utils_1.responseStringify)(res));
+        }
+    }
+    async _postUrlEncoded(path, params, options) {
+        const data = (0, utils_1.paramToUrl)(params);
+        const agent = this.getClient(options?.proxyParams);
+        const res = await agent.post({
+            path,
+            data,
+            headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+            timeout: options?.timeout,
+        });
+        if (res.ok) {
+            return res;
+        }
+        else {
+            throw new Error(await (0, utils_1.responseStringify)(res));
+        }
     }
 }
 exports.PlaneTrackerAPI = PlaneTrackerAPI;

package/esm/PlaneTrackerAPI.js

@@ -20,6 +20,19 @@ export class PlaneTrackerAPI {
         const res = await this._getJson(`${BASE_PATH}/camera_time.cgi`, undefined, options);
         return z.boolean().parse(res.state);
     }
+    async serverRunCheck(options) {
+        const agent = this.getClient(options?.proxyParams);
+        return await agent.get({ path: `${BASE_PATH}/package/serverRunCheck.cgi`, timeout: options?.timeout });
+    }
+    async getLiveViewAlias(rtspUrl, options) {
+        const agent = this.getClient(options?.proxyParams);
+        const res = await agent.get({
+            path: `${BASE_PATH}/getLiveViewAlias.cgi`,
+            parameters: { rtsp_url: rtspUrl },
+            timeout: options?.timeout,
+        });
+        return wsAliasResponseSchema.parse(await res.json());
+    }
     async resetPtzCalibration(options) {
         const agent = this.getClient(options?.proxyParams);
         const res = await agent.get({
@@ -42,19 +55,6 @@ export class PlaneTrackerAPI {
             throw new ResetCalibrationError('FOCUS', await responseStringify(res));
         }
     }
-    async serverRunCheck(options) {
-        const agent = this.getClient(options?.proxyParams);
-        return await agent.get({ path: `${BASE_PATH}/package/serverRunCheck.cgi`, timeout: options?.timeout });
-    }
-    async getLiveViewAlias(rtspUrl, options) {
-        const agent = this.getClient(options?.proxyParams);
-        const res = await agent.get({
-            path: `${BASE_PATH}/getLiveViewAlias.cgi`,
-            parameters: { rtsp_url: rtspUrl },
-            timeout: options?.timeout,
-        });
-        return wsAliasResponseSchema.parse(await res.json());
-    }
     async fetchCameraSettings(options) {
         const res = await this._getJson(`${BASE_PATH}/package_camera_settings.cgi`, { action: 'get' }, options);
         return cameraSettingsSchema.parse(res);
@@ -92,7 +92,7 @@ export class PlaneTrackerAPI {
         return trackingModeSchema.parse(res);
     }
     async setTrackingMode(mode, options) {
-        await this._postJsonEncoded(`${BASE_PATH}/package/setTrackingMode.cgi`, { mode: mode }, this.apiUser, options);
+        await this._postJsonEncoded(`${BASE_PATH}/package/setTrackingMode.cgi`, { mode }, this.apiUser, options);
     }
     async startTrackingPlane(icao, options) {
         const agent = this.getClient(options?.proxyParams);
@@ -115,21 +115,21 @@ export class PlaneTrackerAPI {
         return priorityListSchema.parse(res);
     }
     async setPriorityList(priorityList, options) {
-        return await this._postJsonEncoded(`${BASE_PATH}/package/setPriorityList.cgi`, { priorityList: priorityList }, this.apiUser, options);
+        return await this._postJsonEncoded(`${BASE_PATH}/package/setPriorityList.cgi`, { priorityList }, this.apiUser, options);
     }
     async getWhiteList(options) {
         const res = await this._getJson(`${BASE_PATH}/package/getWhiteList.cgi`, undefined, options);
         return whiteListSchema.parse(res);
     }
     async setWhiteList(whiteList, options) {
-        return await this._postJsonEncoded(`${BASE_PATH}/package/setWhiteList.cgi`, { whiteList: whiteList }, this.apiUser, options);
+        return await this._postJsonEncoded(`${BASE_PATH}/package/setWhiteList.cgi`, { whiteList }, this.apiUser, options);
     }
     async getBlackList(options) {
         const res = await this._getJson(`${BASE_PATH}/package/getBlackList.cgi`, undefined, options);
         return blackListSchema.parse(res);
     }
     async setBlackList(blackList, options) {
-        return await this._postJsonEncoded(`${BASE_PATH}/package/setBlackList.cgi`, { blackList: blackList }, this.apiUser, options);
+        return await this._postJsonEncoded(`${BASE_PATH}/package/setBlackList.cgi`, { blackList }, this.apiUser, options);
     }
     async fetchMapInfo(options) {
         const res = await this._getJson(`${BASE_PATH}/package/getMapInfo.cgi`, undefined, options);
@@ -155,7 +155,7 @@ export class PlaneTrackerAPI {
     }
     async getGenetecCameraList(params, options) {
         const res = await this._postUrlEncoded(`${BASE_PATH}/package/getGenetecCameraList.cgi`, params, options);
-        return cameraListSchema.parse(res);
+        return cameraListSchema.parse(await res.json());
     }
     async _getJson(path, parameters, options, headers) {
         const agent = this.getClient(options?.proxyParams);
@@ -167,16 +167,6 @@ export class PlaneTrackerAPI {
             throw new Error(await responseStringify(res));
         }
     }
-    async _post(path, data, parameters, options, headers) {
-        const agent = this.getClient(options?.proxyParams);
-        const res = await agent.post({ path, data, parameters, headers, timeout: options?.timeout });
-        if (res.ok) {
-            return await res.json();
-        }
-        else {
-            throw new Error(await responseStringify(res));
-        }
-    }
     async _getBlob(path, parameters, options) {
         const agent = this.getClient(options?.proxyParams);
         const res = await agent.get({ path, parameters, timeout: options?.timeout });
@@ -195,14 +185,37 @@ export class PlaneTrackerAPI {
             throw new ParsingBlobError(err);
         }
     }
-    async _postUrlEncoded(path, parameters, options, headers) {
-        const baseHeaders = { 'Content-Type': 'application/x-www-form-urlencoded' };
-        const data = paramToUrl(parameters);
-        return this._post(path, data, {}, options, { ...baseHeaders, ...headers });
-    }
-    async _postJsonEncoded(path, data, parameters, options, headers) {
-        const baseHeaders = { 'Accept': 'application/json', 'Content-Type': 'application/json' };
+    async _postJsonEncoded(path, data, parameters, options) {
+        const agent = this.getClient(options?.proxyParams);
         const jsonData = JSON.stringify(data);
-        return this._post(path, jsonData, parameters, options, { ...baseHeaders, ...headers });
+        const res = await agent.post({
+            path,
+            data: jsonData,
+            parameters,
+            headers: { 'Accept': 'application/json', 'Content-Type': 'application/json' },
+            timeout: options?.timeout,
+        });
+        if (res.ok) {
+            return res;
+        }
+        else {
+            throw new Error(await responseStringify(res));
+        }
+    }
+    async _postUrlEncoded(path, params, options) {
+        const data = paramToUrl(params);
+        const agent = this.getClient(options?.proxyParams);
+        const res = await agent.post({
+            path,
+            data,
+            headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+            timeout: options?.timeout,
+        });
+        if (res.ok) {
+            return res;
+        }
+        else {
+            throw new Error(await responseStringify(res));
+        }
     }
 }

package/package.json

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

package/types/PlaneTrackerAPI.d.ts

@@ -9,14 +9,14 @@ export declare class PlaneTrackerAPI<Client extends IClient<TResponse, any>> {
     static getProxyPath: () => string;
     getClient(proxyParams?: TProxyParams): Client | ProxyClient<Client>;
     checkCameraTime(options?: THttpRequestOptions): Promise<boolean>;
-    resetPtzCalibration(options?: THttpRequestOptions): Promise<void>;
-    resetFocusCalibration(options?: THttpRequestOptions): Promise<void>;
     serverRunCheck(options?: THttpRequestOptions): Promise<TResponse>;
     getLiveViewAlias(rtspUrl: string, options?: THttpRequestOptions): Promise<{
         ws: string;
         ws_initial_message: string;
         alias: string;
     }>;
+    resetPtzCalibration(options?: THttpRequestOptions): Promise<void>;
+    resetFocusCalibration(options?: THttpRequestOptions): Promise<void>;
     fetchCameraSettings(options?: THttpRequestOptions): Promise<{
         camera: {
             ip: string;
@@ -133,7 +133,7 @@ export declare class PlaneTrackerAPI<Client extends IClient<TResponse, any>> {
             displayAircraftInfo?: boolean | undefined;
         } | undefined;
     }>;
-    setCameraSettings(settings: TCameraSettings, options?: THttpRequestOptions): Promise<any>;
+    setCameraSettings(settings: TCameraSettings, options?: THttpRequestOptions): Promise<TResponse>;
     fetchServerSettings(options?: THttpRequestOptions): Promise<{
         cameraCalibration: {
             posLat: number;
@@ -180,15 +180,15 @@ export declare class PlaneTrackerAPI<Client extends IClient<TResponse, any>> {
     getPriorityList(options?: THttpRequestOptions): Promise<{
         priorityList: string[];
     }>;
-    setPriorityList(priorityList: TPriorityList['priorityList'], options?: THttpRequestOptions): Promise<any>;
+    setPriorityList(priorityList: TPriorityList['priorityList'], options?: THttpRequestOptions): Promise<TResponse>;
     getWhiteList(options?: THttpRequestOptions): Promise<{
         whiteList: string[];
     }>;
-    setWhiteList(whiteList: TWhiteList['whiteList'], options?: THttpRequestOptions): Promise<any>;
+    setWhiteList(whiteList: TWhiteList['whiteList'], options?: THttpRequestOptions): Promise<TResponse>;
     getBlackList(options?: THttpRequestOptions): Promise<{
         blackList: string[];
     }>;
-    setBlackList(blackList: TBlackList['blackList'], options?: THttpRequestOptions): Promise<any>;
+    setBlackList(blackList: TBlackList['blackList'], options?: THttpRequestOptions): Promise<TResponse>;
     fetchMapInfo(options?: THttpRequestOptions): Promise<{
         minZoom: number;
         maxZoom: number;
@@ -215,16 +215,15 @@ export declare class PlaneTrackerAPI<Client extends IClient<TResponse, any>> {
     }>;
     setZones(zones: TZones, options?: THttpRequestOptions): Promise<void>;
     goToCoordinates(lat: number, lon: number, alt?: number, options?: THttpRequestOptions): Promise<TResponse>;
-    checkGenetecConnection(params: TParameters, options?: THttpRequestOptions): Promise<any>;
+    checkGenetecConnection(params: TParameters, options?: THttpRequestOptions): Promise<TResponse>;
     getGenetecCameraList(params: TParameters, options?: THttpRequestOptions): Promise<{
         value: string;
         index: number;
         label: string;
     }[]>;
     private _getJson;
-    private _post;
     private _getBlob;
     private parseBlobResponse;
-    private _postUrlEncoded;
     private _postJsonEncoded;
+    private _postUrlEncoded;
 }