camstreamerlib 4.0.0-beta.97 → 4.0.1

package/cjs/CamOverlayAPI.js

@@ -1,23 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CamOverlayAPI = void 0;
-const utils_1 = require("./internal/utils");
 const errors_1 = require("./errors/errors");
 const common_1 = require("./types/common");
 const zod_1 = require("zod");
-const ProxyClient_1 = require("./internal/ProxyClient");
 const CamOverlayAPI_1 = require("./types/CamOverlayAPI");
+const BasicAPI_1 = require("./internal/BasicAPI");
 const BASE_PATH = '/local/camoverlay/api';
-class CamOverlayAPI {
-    client;
-    constructor(client) {
-        this.client = client;
-    }
+class CamOverlayAPI extends BasicAPI_1.BasicAPI {
     static getBasePath = () => BASE_PATH;
     static getProxyPath = () => `${BASE_PATH}/proxy.cgi`;
     static getFilePreviewPath = (path) => `${BASE_PATH}/image.cgi?path=${encodeURIComponent(path)}`;
-    getClient(proxyParams) {
-        return proxyParams ? new ProxyClient_1.ProxyClient(this.client, proxyParams) : this.client;
+    async checkAPIAvailable(options) {
+        await this._getJson(`${BASE_PATH}/api_check.cgi`, undefined, options);
     }
     async checkCameraTime(options) {
         const res = await this._getJson(`${BASE_PATH}/camera_time.cgi`, undefined, options);
@@ -36,7 +31,7 @@ class CamOverlayAPI {
     }
     async listFiles(fileType, options) {
         const res = await this._getJson(`${BASE_PATH}/upload_${fileType}.cgi`, { action: 'list' }, options);
-        return CamOverlayAPI_1.fileListSchema.parse(res.list);
+        return (0, CamOverlayAPI_1.getFileListSchema)(fileType).parse(res.list);
     }
     async uploadFile(fileType, formData, storage, options) {
         await this._post(`${BASE_PATH}/upload_${fileType}.cgi`, formData, {
@@ -48,14 +43,14 @@ class CamOverlayAPI {
         await this._postUrlEncoded(`${BASE_PATH}/upload_${fileType}.cgi`, {
             action: 'remove',
             ...fileParams,
-        }, options, undefined);
+        }, options);
     }
     async getFileStorage(fileType, options) {
         const res = await this._getJson(`${BASE_PATH}/upload_${fileType}.cgi`, { action: 'get_storage' }, options);
         if (res.code !== 200) {
             throw new errors_1.StorageDataFetchError(res);
         }
-        return CamOverlayAPI_1.storageDataListSchema.parse(res.list);
+        return (0, CamOverlayAPI_1.getStorageDataListSchema)(fileType).parse(res.list);
     }
     async getFilePreviewFromCamera(path, options) {
         return await this._getBlob(CamOverlayAPI.getFilePreviewPath(path), undefined, options);
@@ -99,15 +94,15 @@ class CamOverlayAPI {
         return services;
     }
     async updateSingleService(service, options) {
-        await this._postJsonEncoded(`${BASE_PATH}/services.cgi`, JSON.stringify(service), {
+        await this._postJsonEncoded(`${BASE_PATH}/services.cgi`, service, {
             action: 'set',
             service_id: service.id,
-        }, options, undefined);
+        }, options);
     }
     async updateServices(services, options) {
-        await this._postJsonEncoded(`${BASE_PATH}/services.cgi`, JSON.stringify({ services: services }), {
+        await this._postJsonEncoded(`${BASE_PATH}/services.cgi`, { services: services }, {
             action: 'set',
-        }, options, undefined);
+        }, options);
     }
     updateCGText(serviceId, fields, options) {
         const params = {};
@@ -146,6 +141,9 @@ class CamOverlayAPI {
         };
         return this.promiseCGUpdate(serviceId, 'update_image', params, contentType, imageData, options);
     }
+    downloadReport(options) {
+        return this._getText(`${BASE_PATH}/report.cgi`, undefined, options);
+    }
     async promiseCGUpdate(serviceId, action, params = {}, contentType, data, options) {
         const path = `${BASE_PATH}/customGraphics.cgi`;
         let headers = {};
@@ -168,52 +166,5 @@ class CamOverlayAPI {
             throw new errors_1.ErrorWithResponse(res);
         }
     }
-    async _getJson(path, parameters, options) {
-        const agent = this.getClient(options?.proxyParams);
-        const res = await agent.get({ path, parameters, timeout: options?.timeout });
-        if (res.ok) {
-            return await res.json();
-        }
-        else {
-            throw new errors_1.ErrorWithResponse(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 errors_1.ErrorWithResponse(res);
-        }
-    }
-    async _getBlob(path, parameters, options) {
-        const agent = this.getClient(options?.proxyParams);
-        const res = await agent.get({ path, parameters, timeout: options?.timeout });
-        if (res.ok) {
-            return await this.parseBlobResponse(res);
-        }
-        else {
-            throw new errors_1.ErrorWithResponse(res);
-        }
-    }
-    async parseBlobResponse(response) {
-        try {
-            return (await response.blob());
-        }
-        catch (err) {
-            throw new errors_1.ParsingBlobError(err);
-        }
-    }
-    async _postUrlEncoded(path, parameters, options, headers) {
-        const data = (0, utils_1.paramToUrl)(parameters);
-        const baseHeaders = { 'Content-Type': 'application/x-www-form-urlencoded' };
-        return this._post(path, data, undefined, options, { ...baseHeaders, ...headers });
-    }
-    async _postJsonEncoded(path, data, parameters, options, headers) {
-        const baseHeaders = { 'Accept': 'application/json', 'Content-Type': 'application/json' };
-        return this._post(path, data, parameters, options, { ...baseHeaders, ...headers });
-    }
 }
 exports.CamOverlayAPI = CamOverlayAPI;

package/cjs/CamScripterAPI.d.ts

@@ -1,11 +1,9 @@
-import { ProxyClient } from './internal/ProxyClient';
+import { BasicAPI } from './internal/BasicAPI';
 import { IClient, TResponse } from './internal/types';
-import { THttpRequestOptions, TProxyParams, TStorageType } from './types/common';
-export declare class CamScripterAPI<Client extends IClient<TResponse, any>> {
-    private client;
-    constructor(client: Client);
+import { THttpRequestOptions, TStorageType } from './types/common';
+export declare class CamScripterAPI<Client extends IClient<TResponse, any>> extends BasicAPI<Client> {
     static getProxyPath: () => string;
-    getClient(proxyParams?: TProxyParams): Client | ProxyClient<Client>;
+    checkAPIAvailable(options?: THttpRequestOptions): Promise<void>;
     checkCameraTime(options?: THttpRequestOptions): Promise<boolean>;
     getNetworkCameraList(options?: THttpRequestOptions): Promise<{
         name: string;
@@ -41,6 +39,5 @@ export declare class CamScripterAPI<Client extends IClient<TResponse, any>> {
         node_state: "OK" | "NOT_INSTALLED" | "NOT_FOUND";
     }>;
     installNodejs(storage: TStorageType, options?: THttpRequestOptions): Promise<void>;
-    private _getJson;
-    private _post;
+    downloadReport(options?: THttpRequestOptions): Promise<string>;
 }

package/cjs/CamScripterAPI.js

@@ -1,23 +1,22 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CamScripterAPI = void 0;
-const errors_1 = require("./errors/errors");
-const ProxyClient_1 = require("./internal/ProxyClient");
+const zod_1 = __importDefault(require("zod"));
+const BasicAPI_1 = require("./internal/BasicAPI");
 const CamScripterAPI_1 = require("./types/CamScripterAPI");
 const common_1 = require("./types/common");
 const BASE_PATH = '/local/camscripter';
-class CamScripterAPI {
-    client;
-    constructor(client) {
-        this.client = client;
-    }
+class CamScripterAPI extends BasicAPI_1.BasicAPI {
     static getProxyPath = () => `${BASE_PATH}/proxy.cgi`;
-    getClient(proxyParams) {
-        return proxyParams ? new ProxyClient_1.ProxyClient(this.client, proxyParams) : this.client;
+    async checkAPIAvailable(options) {
+        await this._getJson(`${BASE_PATH}/api_check.cgi`, undefined, options);
     }
     async checkCameraTime(options) {
         const res = await this._getJson(`${BASE_PATH}/camera_time.cgi`, undefined, options);
-        return CamScripterAPI_1.cameraTimeResponseSchema.parse(res).state;
+        return zod_1.default.boolean().parse(res.state);
     }
     async getNetworkCameraList(options) {
         const res = await this._getJson(`${BASE_PATH}/network_camera_list.cgi`, undefined, options);
@@ -56,25 +55,8 @@ class CamScripterAPI {
     async installNodejs(storage, options) {
         await this._getJson(`${BASE_PATH}/node_update.cgi`, { storage: storage }, options);
     }
-    async _getJson(path, parameters, options) {
-        const agent = this.getClient(options?.proxyParams);
-        const res = await agent.get({ path, parameters, timeout: options?.timeout });
-        if (res.ok) {
-            return await res.json();
-        }
-        else {
-            throw new errors_1.ErrorWithResponse(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 errors_1.ErrorWithResponse(res);
-        }
+    downloadReport(options) {
+        return this._getText(`${BASE_PATH}/report.cgi`, undefined, options);
     }
 }
 exports.CamScripterAPI = CamScripterAPI;