camstreamerlib 3.5.2 → 4.0.0-beta.2

package/CamOverlayPainter/ResourceManager.js

@@ -1,22 +1,12 @@
-"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 });
-const fs = require("fs/promises");
-class ResourceManager {
+import * as fs from 'fs/promises';
+export default class ResourceManager {
+    co;
+    imgFileNames = {};
+    fontFileNames = {};
+    images = {};
+    fonts = {};
     constructor(co) {
         this.co = co;
-        this.imgFileNames = {};
-        this.fontFileNames = {};
-        this.images = {};
-        this.fonts = {};
     }
     registerImage(moniker, fileName) {
         this.imgFileNames[moniker] = process.env.INSTALL_PATH + '/images/' + fileName;
@@ -24,39 +14,34 @@ class ResourceManager {
     registerFont(moniker, fileName) {
         this.fontFileNames[moniker] = process.env.INSTALL_PATH + '/fonts/' + fileName;
     }
-    image(moniker) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (moniker in this.images) {
-                return this.images[moniker];
-            }
-            else if (moniker in this.imgFileNames) {
-                const imgData = yield fs.readFile(this.imgFileNames[moniker]);
-                this.images[moniker] = yield this.co.uploadImageData(imgData);
-                return this.images[moniker];
-            }
-            else {
-                throw new Error('Error! Unknown image requested!');
-            }
-        });
+    async image(moniker) {
+        if (moniker in this.images) {
+            return this.images[moniker];
+        }
+        else if (moniker in this.imgFileNames) {
+            const imgData = await fs.readFile(this.imgFileNames[moniker]);
+            this.images[moniker] = await this.co.uploadImageData(imgData);
+            return this.images[moniker];
+        }
+        else {
+            throw new Error('Error! Unknown image requested!');
+        }
     }
-    font(moniker) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (moniker in this.fonts) {
-                return this.fonts[moniker];
-            }
-            else if (moniker in this.fontFileNames) {
-                const fontData = yield fs.readFile(this.fontFileNames[moniker]);
-                this.fonts[moniker] = yield this.co.uploadFontData(fontData);
-                return this.fonts[moniker];
-            }
-            else {
-                throw new Error('Error! Unknown font requested!');
-            }
-        });
+    async font(moniker) {
+        if (moniker in this.fonts) {
+            return this.fonts[moniker];
+        }
+        else if (moniker in this.fontFileNames) {
+            const fontData = await fs.readFile(this.fontFileNames[moniker]);
+            this.fonts[moniker] = await this.co.uploadFontData(fontData);
+            return this.fonts[moniker];
+        }
+        else {
+            throw new Error('Error! Unknown font requested!');
+        }
     }
     clear() {
         this.images = {};
         this.fonts = {};
     }
 }
-exports.default = ResourceManager;

package/CamScripterAPI.d.ts

@@ -0,0 +1,19 @@
+import { IClient } from './internal/common';
+import { CamScripterOptions, TNodeState, TPackageInfoList, TStorage, TStorageType } from './types/CamScripterAPI';
+import { TNetworkCamera } from './types/common';
+export declare class CamOverlayAPI {
+    private client;
+    constructor(options?: CamScripterOptions | IClient);
+    checkCameraTime(): Promise<boolean>;
+    getStorageInfo(): Promise<TStorage>;
+    getNetworkCameraList(): Promise<TNetworkCamera[]>;
+    getPackageList(): Promise<TPackageInfoList>;
+    installPackages(formData: FormData, storage: TStorageType): Promise<void>;
+    uninstallPackage(packageId: string): Promise<void>;
+    importSettings(packageId: string, formData: FormData): Promise<void>;
+    exportSettings(packageId: string, formData: FormData): Promise<void>;
+    getNodejsStatus(): Promise<TNodeState>;
+    installNodejs(storage: TStorageType): Promise<void>;
+    private get;
+    private post;
+}

package/CamScripterAPI.js

@@ -0,0 +1,66 @@
+import { isClient, responseStringify } from './internal/common';
+import { DefaultClient } from './node/DefaultClient';
+import { packageInfoListSchema, storageSchema, } from './types/CamScripterAPI';
+import { networkCameraListSchema } from './types/common';
+export class CamOverlayAPI {
+    client;
+    constructor(options = {}) {
+        if (isClient(options)) {
+            this.client = options;
+        }
+        else {
+            this.client = new DefaultClient(options);
+        }
+    }
+    async checkCameraTime() {
+        return (await this.get('/local/camscripter/camera_time.cgi')).state;
+    }
+    async getStorageInfo() {
+        const data = await this.get(`/local/camscripter/package/get_storage.cgi`);
+        return storageSchema.parse(data);
+    }
+    async getNetworkCameraList() {
+        const response = await this.get('/local/camscripter/network_camera_list.cgi');
+        return networkCameraListSchema.parse(response.camera_list);
+    }
+    async getPackageList() {
+        const data = await this.get('/local/camscripter/package/list.cgi');
+        return packageInfoListSchema.parse(data);
+    }
+    async installPackages(formData, storage) {
+        await this.post(`/local/camscripter/package/install.cgi?storage=${storage}`, formData);
+    }
+    async uninstallPackage(packageId) {
+        await this.get(`/local/camscripter/package/remove.cgi?package_name=${packageId}`);
+    }
+    async importSettings(packageId, formData) {
+        await this.post(`/local/camscripter/package/data.cgi?action=IMPORT&package_name=${packageId}`, formData);
+    }
+    async exportSettings(packageId, formData) {
+        await this.post(`/local/camscripter/package/data.cgi?action=EXPORT&package_name=${packageId}`, formData);
+    }
+    async getNodejsStatus() {
+        return (await this.get('/local/camscripter/diagnostics.cgi')).node_state;
+    }
+    async installNodejs(storage) {
+        await this.get(`/local/camscripter/node_update.cgi?storage=${storage}`);
+    }
+    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));
+        }
+    }
+    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));
+        }
+    }
+}

package/CamScripterAPICameraEventsGenerator.js

@@ -1,18 +1,25 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CamScripterAPICameraEventsGenerator = void 0;
-const EventEmitter = require("events");
-const WsClient_1 = require("./internal/WsClient");
-class CamScripterAPICameraEventsGenerator extends EventEmitter {
+import * as EventEmitter from 'events';
+import { WsClient } from './node/WsClient';
+export class CamScripterAPICameraEventsGenerator extends EventEmitter {
+    tls;
+    tlsInsecure;
+    ip;
+    port;
+    user;
+    pass;
+    callId;
+    sendMessages;
+    timeoutCheckTimer;
+    wsConnected;
+    ws;
     constructor(options) {
-        var _a, _b, _c, _d, _e, _f;
         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.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.callId = 0;
         this.sendMessages = {};
         this.wsConnected = false;
@@ -59,7 +66,7 @@ class CamScripterAPICameraEventsGenerator extends EventEmitter {
             address: `/local/camscripter/ws`,
             protocol: 'camera-events',
         };
-        this.ws = new WsClient_1.WsClient(options);
+        this.ws = new WsClient(options);
         this.ws.on('open', () => {
             this.wsConnected = true;
             this.emit('open');
@@ -79,7 +86,7 @@ class CamScripterAPICameraEventsGenerator 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));
             }
@@ -146,4 +153,3 @@ class CamScripterAPICameraEventsGenerator extends EventEmitter {
         this.emit('close');
     }
 }
-exports.CamScripterAPICameraEventsGenerator = CamScripterAPICameraEventsGenerator;

package/CamStreamerAPI.d.ts

@@ -1,38 +1,16 @@
-import { IClient, HttpOptions } from './internal/common';
-export type CamStreamerAPIOptions = HttpOptions;
-export type TStreamAttributes = {
-    enabled: string;
-    active: string;
-    audioSource: string;
-    avSyncMsec: string;
-    internalVapixParameters: string;
-    userVapixParameters: string;
-    outputParameters: string;
-    outputType: string;
-    mediaServerUrl: string;
-    inputType: string;
-    inputUrl: string;
-    forceStereo: string;
-    streamDelay: string;
-    statusLed: string;
-    statusPort: string;
-    callApi: string;
-    trigger: string;
-    schedule: string;
-    prepareAhead: string;
-    startTime: string;
-    stopTime: string;
-};
-export type TStreamList = Record<string, TStreamAttributes>;
+import { IClient } from './internal/common';
+import { CamStreamerAPIOptions, TStreamAttributes, TStreamList } from './types/CamStreamerAPI';
 export declare class CamStreamerAPI {
     private client;
     constructor(options?: CamStreamerAPIOptions | IClient);
     getStreamList(): Promise<TStreamList>;
     getStream(streamID: string): Promise<TStreamAttributes>;
     getStreamParameter(streamID: string, paramName: string): Promise<string>;
-    setStream(streamID: string, params: TStreamAttributes): Promise<void>;
+    setStream(streamID: string, params: Partial<TStreamAttributes>): Promise<void>;
     setStreamParameter(streamID: string, paramName: string, value: string): Promise<void>;
     isStreaming(streamID: string): Promise<boolean>;
     deleteStream(streamID: string): Promise<void>;
+    wsAutoratization(): Promise<string>;
+    getUtcTime(): Promise<number>;
     private get;
 }

package/CamStreamerAPI.js

@@ -1,87 +1,61 @@
-"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());
-    });
-};
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CamStreamerAPI = void 0;
-const common_1 = require("./internal/common");
-const DefaultAgent_1 = require("./DefaultAgent");
-class CamStreamerAPI {
+import { isClient, responseStringify } from './internal/common';
+import { DefaultClient } from './node/DefaultClient';
+import { streamAttributesSchema, streamListSchema, } from './types/CamStreamerAPI';
+export class CamStreamerAPI {
+    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);
         }
     }
-    getStreamList() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const streamListRes = yield this.get('/local/camstreamer/stream/list.cgi');
-            return streamListRes.data;
-        });
+    async getStreamList() {
+        const streamListRes = await this.get('/local/camstreamer/stream/list.cgi');
+        return streamListSchema.parse(streamListRes.data);
     }
-    getStream(streamID) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const stream = yield this.get(`/local/camstreamer/stream/get.cgi?stream_id=${streamID}`);
-            return stream.data;
-        });
+    async getStream(streamID) {
+        const stream = await this.get(`/local/camstreamer/stream/get.cgi?stream_id=${streamID}`);
+        return streamAttributesSchema.parse(stream.data);
     }
-    getStreamParameter(streamID, paramName) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const stream = yield this.get(`/local/camstreamer/stream/get.cgi?stream_id=${streamID}`);
-            return stream.data[paramName];
-        });
+    async getStreamParameter(streamID, paramName) {
+        const stream = await this.get(`/local/camstreamer/stream/get.cgi?stream_id=${streamID}`);
+        return stream.data[paramName];
     }
-    setStream(streamID, params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { streamDelay, startTime, stopTime } = params, rest = __rest(params, ["streamDelay", "startTime", "stopTime"]);
-            yield this.get('/local/camstreamer/stream/set.cgi', Object.assign({ stream_id: streamID, streamDelay: streamDelay !== null && streamDelay !== void 0 ? streamDelay : '', startTime: startTime !== null && startTime !== void 0 ? startTime : 'null', stopTime: stopTime !== null && stopTime !== void 0 ? stopTime : 'null' }, rest));
+    async setStream(streamID, params) {
+        const { streamDelay, startTime, stopTime, ...rest } = params;
+        await this.get('/local/camstreamer/stream/set.cgi', {
+            stream_id: streamID,
+            streamDelay: streamDelay ?? '',
+            startTime: startTime ?? 'null',
+            stopTime: stopTime ?? 'null',
+            ...rest,
         });
     }
-    setStreamParameter(streamID, paramName, value) {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.get(`/local/camstreamer/stream/set.cgi?stream_id=${streamID}&${paramName}=${value}`);
-        });
+    async setStreamParameter(streamID, paramName, value) {
+        await this.get(`/local/camstreamer/stream/set.cgi?stream_id=${streamID}&${paramName}=${value}`);
     }
-    isStreaming(streamID) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const response = yield this.get(`/local/camstreamer/get_streamstat.cgi?stream_id=${streamID}`);
-            return response.data.is_streaming === 1;
-        });
+    async isStreaming(streamID) {
+        const response = await this.get(`/local/camstreamer/get_streamstat.cgi?stream_id=${streamID}`);
+        return response.data.is_streaming === 1;
     }
-    deleteStream(streamID) {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.get('/local/camstreamer/stream/remove.cgi', { stream_id: streamID });
-        });
+    async deleteStream(streamID) {
+        await this.get('/local/camstreamer/stream/remove.cgi', { stream_id: streamID });
     }
-    get(path, parameters) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const res = yield this.client.get(path, parameters);
-            if (res.ok) {
-                return yield res.json();
-            }
-            else {
-                throw new Error(yield (0, common_1.responseStringify)(res));
-            }
-        });
+    wsAutoratization() {
+        return this.get('/local/camstreamer/ws_authorization.cgi');
+    }
+    async getUtcTime() {
+        return await this.get('/local/camstreamer/get_utc_time.cgi');
+    }
+    async get(path, parameters) {
+        const res = await this.client.get(path, parameters);
+        if (res.ok) {
+            return await res.json();
+        }
+        else {
+            throw new Error(await responseStringify(res));
+        }
     }
 }
-exports.CamStreamerAPI = CamStreamerAPI;

package/CamSwitcherAPI.d.ts

@@ -1,81 +1,48 @@
-/// <reference types="node" />
-import { HttpOptions, IClient } from './internal/common';
-export type CamSwitcherAPIOptions = HttpOptions;
-export type TStreamInfo = {
-    id: string;
-    isTimeoutCustom: boolean;
-    ptz_preset_pos_name: string;
-    repeat: number;
-    timeout: number;
-    video: Record<string, string>;
-    audio: Record<string, string>;
-};
-export type TPlaylistInfo = {
-    channel: string;
-    isFavourite: false;
-    keyboard: object;
-    loop: boolean;
-    niceName: string;
-    sortIndexFavourite: number;
-    sortIndexOverview: number;
-    stream_list: TStreamInfo[];
-};
-export type TPlaylistList = Record<string, TPlaylistInfo>;
-export type TClipInfo = {
-    niceName: string;
-    channel: string;
-    keyboard: object;
-    sortIndexOverview: number;
-};
-export type TClipList = Record<string, TClipInfo>;
-export type TApiClipType = 'audio' | 'video';
-export type TClipStorage = 'SD_DISK' | 'FLASH';
-export type TPlaylistQueue = {
-    playlist_queue_list: string[];
-};
-export type TOutputInfo = {
-    rtsp_url: string;
-    ws: string;
-    ws_initial_message: string;
-};
-export type TSilenceChannel = 'mono' | 'stereo';
-export type TAvailableCameraList = {
-    camera_list: {
-        name: string;
-        ip: string;
-    }[];
-};
-export type TStorageInfo = {
-    storage: TClipStorage;
-    writable: boolean;
-    size: number;
-    available: number;
-};
-declare const cgiNames: {
-    camera: string;
-    audio: string;
-    playlist: string;
-    clip: string;
-    tracker: string;
-};
-export type TSourceType = keyof typeof cgiNames;
-export declare class CamSwitcherAPI {
-    private client;
-    constructor(options?: CamSwitcherAPIOptions | IClient);
-    generateSilence(sampleRate: number, channels: TSilenceChannel): Promise<void>;
-    getIpListFromNetworkCheck(): Promise<TAvailableCameraList>;
+import { IClient } from './internal/common';
+import { TAudioPushInfo, TOutputInfo, TStorageInfo, TStreamSaveList, TClipList, TStreamSaveLoadList, TClipSaveLoadList, TPlaylistSaveLoadList, TTrackerSaveList, TrackerSaveLoadList, TClipSaveList, TPlaylistSaveList, TCameraOptions, TGlobalAudioSettings, TSecondaryAudioSettings } from './types/CamSwitcherAPI';
+import { TAudioChannel, TNetworkCamera, TStorageType } from './types/common';
+export declare class CamSwitcherAPI<Client extends IClient = IClient> {
+    client: Client;
+    private vapixAgent;
+    constructor(client: Client);
+    static getProxyUrl: () => string;
+    static getWsEventsUrl: () => string;
+    static getClipPreview: (id: string, storage: TStorageType) => string;
+    generateSilence(sampleRate: number, channels: TAudioChannel): Promise<void>;
+    checkCameraTime(): Promise<boolean>;
+    getIpListFromNetworkCheck(): Promise<TNetworkCamera[]>;
     getMaxFps(source: number): Promise<number>;
     getStorageInfo(): Promise<TStorageInfo[]>;
+    wsAuthorization(): Promise<string>;
     getOutputInfo(): Promise<TOutputInfo>;
-    getPlaylistList(): Promise<TPlaylistList>;
+    getAudioPushInfo(): Promise<TAudioPushInfo>;
+    getStreamSaveList(): Promise<TStreamSaveLoadList>;
+    getClipSaveList(): Promise<TClipSaveLoadList>;
+    getPlaylistSaveList(): Promise<TPlaylistSaveLoadList>;
+    getTrackerSaveList(): Promise<TrackerSaveLoadList>;
+    setStreamSaveList(data: TStreamSaveList): Promise<boolean>;
+    setClipSaveList(data: TClipSaveList): Promise<boolean>;
+    setPlaylistSaveList(data: TPlaylistSaveList): Promise<boolean>;
+    setTrackerSaveList(data: TTrackerSaveList): Promise<boolean>;
     playlistSwitch(playlistName: string): Promise<void>;
     playlistQueuePush(playlistName: string): Promise<void>;
     playlistQueueClear(): Promise<void>;
-    playlistQueueList(): Promise<TPlaylistQueue>;
+    playlistQueueList(): Promise<string[]>;
     playlistQueuePlayNext(): Promise<void>;
+    addNewClip(file: any, clipType: 'video' | 'audio', storage: TStorageType, id: string, fileName?: string): Promise<void>;
+    removeClip(id: string, storage: TStorageType): Promise<any>;
     getClipList(): Promise<TClipList>;
-    addNewClip(file: Buffer, clipType: TApiClipType, storage: TClipStorage, id: string, fileName: string): Promise<void>;
-    removeClip(id: string, storage: TClipStorage): Promise<{}>;
+    setCamSwitchOptions(data: TCameraOptions, cameraFWVersion: string): Promise<boolean>;
+    setGlobalAudioSettings(settings: TGlobalAudioSettings): Promise<boolean>;
+    setSecondaryAudioSettings(settings: TSecondaryAudioSettings): Promise<boolean>;
+    setDefaultPlaylist(id: string): Promise<boolean>;
+    setPermanentRtspUrlToken(token: string): Promise<boolean>;
+    getCamSwitchOptions(): Promise<Partial<TCameraOptions>>;
+    getGlobalAudioSettings(): Promise<TGlobalAudioSettings>;
+    getSecondaryAudioSettings(): Promise<TSecondaryAudioSettings>;
+    getPermanentRtspUrlToken(): Promise<string>;
     private get;
+    private set;
+    private setParamFromCameraJSON;
+    private getParamFromCameraAndJSONParse;
 }
-export {};