camstreamerlib 3.5.2 → 4.0.0-beta.2

package/CamOverlayAPI.d.ts

@@ -1,36 +1,18 @@
 /// <reference types="node" />
-import { HttpOptions, IClient } from './internal/common';
-export type CamOverlayOptions = HttpOptions;
-export type TField = {
-    field_name: string;
-    text: string;
-    color?: string;
-};
-export type TService = Record<string, any>;
-export type TServiceList = {
-    services: TService[];
-};
-export type TNetworkCameraList = {
-    name: string;
-    ip: string;
-}[];
-export type TImage = {
-    name: string;
-    path: string;
-    storage: string;
-};
-export declare enum ImageType {
-    PNG = 0,
-    JPEG = 1
-}
-export type TCoordinates = 'top_left' | 'top_right' | 'top' | 'bottom_left' | 'bottom_right' | 'bottom' | 'left' | 'right' | 'center' | '';
+import { IClient } from './internal/common';
+import { CamOverlayOptions, ImageType, TCoordinates, TField, TFile, TFileList, TFileType, TService, TServiceList, TStorage } from './types/CamOverlayAPI';
+import { TNetworkCamera } from './types/common';
 export declare class CamOverlayAPI {
     private client;
     constructor(options?: CamOverlayOptions | IClient);
     checkCameraTime(): Promise<boolean>;
-    listImages(): Promise<TImage[]>;
-    uploadImage(file: Buffer, fileName: string): Promise<void>;
-    getNetworkCameraList(): Promise<TNetworkCameraList>;
+    getNetworkCameraList(): Promise<TNetworkCamera[]>;
+    wsAutoratization(): Promise<string>;
+    getMjpegStreamImage(mjpegUrl: string): Promise<Blob>;
+    listFiles(fileType: TFileType): Promise<TFileList>;
+    uploadFile(fileType: TFileType, file: Blob, fileName: string): Promise<void>;
+    removeFile(fileType: TFileType, file: TFile): Promise<void>;
+    getFileStorage(fileType: TFileType): Promise<TStorage>;
     updateInfoticker(serviceID: number, text: string): Promise<void>;
     setEnabled(serviceID: number, enabled: boolean): Promise<void>;
     isEnabled(serviceID: number): Promise<boolean>;
@@ -45,4 +27,5 @@ export declare class CamOverlayAPI {
     private promiseCGUpdate;
     private get;
     private post;
+    private parseBlobResponse;
 }

package/CamOverlayAPI.js

@@ -1,122 +1,95 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CamOverlayAPI = exports.ImageType = void 0;
-const common_1 = require("./internal/common");
-const DefaultAgent_1 = require("./DefaultAgent");
-var ImageType;
-(function (ImageType) {
-    ImageType[ImageType["PNG"] = 0] = "PNG";
-    ImageType[ImageType["JPEG"] = 1] = "JPEG";
-})(ImageType || (exports.ImageType = ImageType = {}));
-class CamOverlayAPI {
+import { isClient, responseStringify } from './internal/common';
+import { DefaultClient } from './node/DefaultClient';
+import { fileListSchema, ImageType, serviceSchema, storageSchema, } from './types/CamOverlayAPI';
+import { ParsingBlobError, ServiceNotFoundError } from './errors/errors';
+import { networkCameraListSchema } from './types/common';
+export class CamOverlayAPI {
+    client;
     constructor(options = {}) {
-        if ((0, common_1.isClient)(options)) {
+        if (isClient(options)) {
             this.client = options;
         }
         else {
-            this.client = new DefaultAgent_1.DefaultAgent(options);
+            this.client = new DefaultClient(options);
         }
     }
-    checkCameraTime() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const cameraTime = yield this.get('/local/camoverlay/api/camera_time.cgi');
-            return cameraTime.state;
-        });
-    }
-    listImages() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const images = yield this.get('/local/camoverlay/api/upload_image.cgi?action=list');
-            return images.list;
-        });
-    }
-    uploadImage(file, fileName) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const formData = new FormData();
-            formData.append('target', 'SD0');
-            formData.append('uploadedFile[]', file, fileName);
-            const path = '/local/camoverlay/api/upload_image.cgi?action=upload';
-            yield this.post(path, formData);
-        });
-    }
-    getNetworkCameraList() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const response = yield this.get('/local/camoverlay/api/network_camera_list.cgi');
-            return response.camera_list;
-        });
-    }
-    updateInfoticker(serviceID, text) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const path = `/local/camoverlay/api/infoticker.cgi?service_id=${serviceID}&text=${text}`;
-            const res = yield this.client.get(path);
-            if (!res.ok) {
-                throw new Error(yield (0, common_1.responseStringify)(res));
-            }
-        });
-    }
-    setEnabled(serviceID, enabled) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const path = `/local/camoverlay/api/enabled.cgi?id_${serviceID}=${enabled ? 1 : 0}`;
-            const res = yield this.client.post(path, '');
-            if (!res.ok) {
-                throw new Error(yield (0, common_1.responseStringify)(res));
-            }
-        });
-    }
-    isEnabled(serviceID) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const path = '/local/camoverlay/api/services.cgi?action=get';
-            const res = yield this.client.get(path);
-            if (res.ok) {
-                const data = JSON.parse(yield res.text());
-                for (const service of data.services) {
-                    if (service.id === serviceID) {
-                        return service.enabled === 1;
-                    }
+    async checkCameraTime() {
+        const cameraTime = await this.get('/local/camoverlay/api/camera_time.cgi');
+        return cameraTime.state;
+    }
+    async getNetworkCameraList() {
+        const response = await this.get('/local/camoverlay/api/network_camera_list.cgi');
+        return networkCameraListSchema.parse(response.camera_list);
+    }
+    async wsAutoratization() {
+        const response = await this.get(`/local/camoverlay/api/ws_authorization.cgi`);
+        return response.data;
+    }
+    async getMjpegStreamImage(mjpegUrl) {
+        const res = await this.get(`/local/camoverlay/api/fetch_mjpeg_image.cgi?mjpeg_url=${encodeURIComponent(decodeURIComponent(mjpegUrl))}`);
+        return await this.parseBlobResponse(res);
+    }
+    async listFiles(fileType) {
+        const files = await this.get(`/local/camoverlay/api/upload_${fileType}.cgi?action=list`);
+        return fileListSchema.parse(files.list);
+    }
+    async uploadFile(fileType, file, fileName) {
+        const formData = new FormData();
+        formData.append('target', 'SD0');
+        formData.append('uploadedFile[]', file, fileName);
+        const path = `/local/camoverlay/api/upload_${fileType}.cgi?action=upload`;
+        await this.post(path, formData);
+    }
+    async removeFile(fileType, file) {
+        const path = `/local/camoverlay/api/upload_${fileType}.cgi?action=remove`;
+        await this.post(path, JSON.stringify(file));
+    }
+    async getFileStorage(fileType) {
+        const data = await this.get(`/local/camoverlay/api/upload_${fileType}.cgi?action=get_storage`);
+        return storageSchema.parse(data);
+    }
+    async updateInfoticker(serviceID, text) {
+        await this.get(`/local/camoverlay/api/infoticker.cgi?service_id=${serviceID}&text=${text}`);
+    }
+    async setEnabled(serviceID, enabled) {
+        await this.post(`/local/camoverlay/api/enabled.cgi?id_${serviceID}=${enabled ? 1 : 0}`, '');
+    }
+    async isEnabled(serviceID) {
+        const res = await this.client.get('/local/camoverlay/api/services.cgi?action=get');
+        if (res.ok) {
+            const data = JSON.parse(await res.text());
+            for (const service of data.services) {
+                if (service.id === serviceID) {
+                    return service.enabled === 1;
                 }
-                throw new Error('Service not found.');
             }
-            else {
-                throw new Error(yield (0, common_1.responseStringify)(res));
-            }
-        });
+            throw new ServiceNotFoundError();
+        }
+        else {
+            throw new Error(await responseStringify(res));
+        }
     }
-    getSingleService(serviceId) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.get('/local/camoverlay/api/services.cgi', { action: 'get', service_id: serviceId.toString() });
+    async getSingleService(serviceId) {
+        const data = await this.get('/local/camoverlay/api/services.cgi', {
+            action: 'get',
+            service_id: serviceId.toString(),
         });
+        return serviceSchema.parse(data);
     }
-    getServices() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const serviceList = yield this.get('/local/camoverlay/api/services.cgi?action=get');
-            return serviceList.services;
-        });
+    async getServices() {
+        const serviceList = await this.get('/local/camoverlay/api/services.cgi?action=get');
+        return serviceSchema.parse(serviceList).services;
     }
-    updateSingleService(serviceId, serviceJson) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const path = '/local/camoverlay/api/services.cgi';
-            yield this.post(path, JSON.stringify(serviceJson), {
-                action: 'set',
-                service_id: serviceId.toString(),
-            });
+    async updateSingleService(serviceId, serviceJson) {
+        const path = '/local/camoverlay/api/services.cgi';
+        await this.post(path, JSON.stringify(serviceJson), {
+            action: 'set',
+            service_id: serviceId.toString(),
         });
     }
-    updateServices(servicesJson) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const path = '/local/camoverlay/api/services.cgi?action=set';
-            const res = yield this.client.post(path, JSON.stringify(servicesJson));
-            if (!res.ok) {
-                throw new Error(yield (0, common_1.responseStringify)(res));
-            }
-        });
+    async updateServices(servicesJson) {
+        const path = '/local/camoverlay/api/services.cgi?action=set';
+        await this.post(path, JSON.stringify(servicesJson));
     }
     updateCGText(serviceID, fields) {
         const params = {};
@@ -155,40 +128,45 @@ class CamOverlayAPI {
         };
         return this.promiseCGUpdate(serviceID, 'update_image', params, contentType, imageData);
     }
-    promiseCGUpdate(serviceID, action, params = {}, contentType, data) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const path = `/local/camoverlay/api/customGraphics.cgi`;
-            let headers = {};
-            if (contentType !== undefined && data) {
-                headers = { 'Content-Type': contentType };
-            }
-            const res = yield this.client.post(path, data !== null && data !== void 0 ? data : '', Object.assign({ action: action, service_id: serviceID.toString() }, params), headers);
-            if (!res.ok) {
-                throw new Error(yield (0, common_1.responseStringify)(res));
-            }
-        });
+    async promiseCGUpdate(serviceID, action, params = {}, contentType, data) {
+        const path = `/local/camoverlay/api/customGraphics.cgi`;
+        let headers = {};
+        if (contentType !== undefined && data) {
+            headers = { 'Content-Type': contentType };
+        }
+        const res = await this.client.post(path, data ?? '', {
+            action: action,
+            service_id: serviceID.toString(),
+            ...params,
+        }, headers);
+        if (!res.ok) {
+            throw new Error(await responseStringify(res));
+        }
     }
-    get(path, params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const res = yield this.client.get(path, params);
-            if (res.ok) {
-                return yield res.json();
-            }
-            else {
-                throw new Error(yield (0, common_1.responseStringify)(res));
-            }
-        });
+    async get(path, params) {
+        const res = await this.client.get(path, params);
+        if (res.ok) {
+            return await res.json();
+        }
+        else {
+            throw new Error(await responseStringify(res));
+        }
     }
-    post(path, data, params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const res = yield this.client.post(path, data, params);
-            if (res.ok) {
-                return yield res.json();
-            }
-            else {
-                throw new Error(yield (0, common_1.responseStringify)(res));
-            }
-        });
+    async post(path, data, params) {
+        const res = await this.client.post(path, data, params);
+        if (res.ok) {
+            return await res.json();
+        }
+        else {
+            throw new Error(await responseStringify(res));
+        }
+    }
+    async parseBlobResponse(response) {
+        try {
+            return await response.blob();
+        }
+        catch (err) {
+            throw new ParsingBlobError(err);
+        }
     }
 }
-exports.CamOverlayAPI = CamOverlayAPI;

package/CamOverlayDrawingAPI.js

@@ -1,24 +1,33 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CamOverlayDrawingAPI = void 0;
-const EventEmitter = require("events");
-const WsClient_1 = require("./internal/WsClient");
-class CamOverlayDrawingAPI extends EventEmitter {
+import * as EventEmitter from 'events';
+import { WsClient } from './node/WsClient';
+export class CamOverlayDrawingAPI extends EventEmitter {
+    tls;
+    tlsInsecure;
+    ip;
+    port;
+    user;
+    pass;
+    cameraList;
+    zIndex;
+    callId;
+    sendMessages;
+    timeoutCheckTimer;
+    wsConnected;
+    ws;
     constructor(options) {
-        var _a, _b, _c, _d, _e, _f, _g;
         super();
-        this.tls = (_a = options === null || options === void 0 ? void 0 : options.tls) !== null && _a !== void 0 ? _a : false;
-        this.tlsInsecure = (_b = options === null || options === void 0 ? void 0 : options.tlsInsecure) !== null && _b !== void 0 ? _b : false;
-        this.ip = (_c = options === null || options === void 0 ? void 0 : options.ip) !== null && _c !== void 0 ? _c : '127.0.0.1';
-        this.port = (_d = options === null || options === void 0 ? void 0 : options.port) !== null && _d !== void 0 ? _d : (this.tls ? 443 : 80);
-        this.user = (_e = options === null || options === void 0 ? void 0 : options.user) !== null && _e !== void 0 ? _e : '';
-        this.pass = (_f = options === null || options === void 0 ? void 0 : options.pass) !== null && _f !== void 0 ? _f : '';
-        this.zIndex = (_g = options === null || options === void 0 ? void 0 : options.zIndex) !== null && _g !== void 0 ? _g : 0;
+        this.tls = options?.tls ?? false;
+        this.tlsInsecure = options?.tlsInsecure ?? false;
+        this.ip = options?.ip ?? '127.0.0.1';
+        this.port = options?.port ?? (this.tls ? 443 : 80);
+        this.user = options?.user ?? '';
+        this.pass = options?.pass ?? '';
+        this.zIndex = options?.zIndex ?? 0;
         this.cameraList = [0];
         if (options && Array.isArray(options.camera)) {
             this.cameraList = options.camera;
         }
-        else if (typeof (options === null || options === void 0 ? void 0 : options.camera) === 'number') {
+        else if (typeof options?.camera === 'number') {
             this.cameraList = [options.camera];
         }
         this.callId = 0;
@@ -88,7 +97,7 @@ class CamOverlayDrawingAPI extends EventEmitter {
             tls: this.tls,
             tlsInsecure: this.tlsInsecure,
         };
-        this.ws = new WsClient_1.WsClient(options);
+        this.ws = new WsClient(options);
         this.ws.on('open', () => {
             console.log('CamOverlay connection opened');
             this.wsConnected = true;
@@ -110,7 +119,7 @@ class CamOverlayDrawingAPI extends EventEmitter {
         if ('error' in dataJSON) {
             errorResponse = dataJSON;
         }
-        if (dataJSON.call_id !== undefined && this.sendMessages[dataJSON.call_id] !== undefined) {
+        if (dataJSON.call_id !== undefined) {
             if (errorResponse !== undefined) {
                 this.sendMessages[dataJSON.call_id].reject(new Error(errorResponse.error));
             }
@@ -217,4 +226,3 @@ class CamOverlayDrawingAPI extends EventEmitter {
         this.emit('close');
     }
 }
-exports.CamOverlayDrawingAPI = CamOverlayDrawingAPI;