camstreamerlib 3.1.0 → 3.2.1

package/CamOverlayAPI.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
-import { IClient, Options } from './internal/common';
-export type CamOverlayOptions = Options;
+import { HttpOptions, IClient } from './internal/common';
+export type CamOverlayOptions = HttpOptions;
 export type TField = {
     field_name: string;
     text: string;

package/CamOverlayDrawingAPI.d.ts

@@ -1,8 +1,8 @@
 /// <reference types="node" />
 /// <reference types="node" />
 import * as EventEmitter from 'events';
-import { Options } from './internal/common';
-export type CamOverlayDrawingOptions = Options & {
+import { WsOptions } from './internal/common';
+export type CamOverlayDrawingOptions = WsOptions & {
     camera?: number | number[];
     zIndex?: number;
 };
@@ -45,11 +45,12 @@ export declare class CamOverlayDrawingAPI extends EventEmitter {
     private zIndex;
     private callId;
     private sendMessages;
-    private connected;
-    private ws?;
+    private wsConnected;
+    private ws;
     constructor(options?: CamOverlayDrawingOptions);
-    connect(): Promise<void>;
+    connect(): void;
     disconnect(): void;
+    isConnected(): boolean;
     cairo(command: string, ...params: unknown[]): Promise<TCairoResponse | TCairoCreateResponse>;
     writeText(...params: TWriteTextParams): Promise<TCairoResponse>;
     uploadImageData(imgBuffer: Buffer): Promise<TUploadImageResponse>;
@@ -57,7 +58,7 @@ export declare class CamOverlayDrawingAPI extends EventEmitter {
     showCairoImage(cairoImage: string, posX: number, posY: number): Promise<TCairoResponse>;
     showCairoImageAbsolute(cairoImage: string, posX: number, posY: number, width: number, height: number): Promise<TCairoResponse>;
     removeImage(): Promise<TCairoResponse>;
-    private openWebsocket;
+    private createWsClient;
     private sendMessage;
     private sendBinaryMessage;
     private reportMessage;

package/CamOverlayDrawingAPI.js

@@ -1,23 +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 });
 exports.CamOverlayDrawingAPI = void 0;
 const EventEmitter = require("events");
-const promises_1 = require("timers/promises");
 const WsClient_1 = require("./internal/WsClient");
 class CamOverlayDrawingAPI extends EventEmitter {
     constructor(options) {
         var _a, _b, _c, _d, _e, _f, _g;
         super();
-        this.connected = false;
         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';
@@ -34,23 +23,18 @@ class CamOverlayDrawingAPI extends EventEmitter {
         }
         this.callId = 0;
         this.sendMessages = {};
+        this.wsConnected = false;
+        this.createWsClient();
         EventEmitter.call(this);
     }
     connect() {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                yield this.openWebsocket();
-                this.connected = true;
-            }
-            catch (err) {
-            }
-        });
+        this.ws.open();
     }
     disconnect() {
-        this.connected = false;
-        if (this.ws !== undefined) {
-            this.ws.close();
-        }
+        this.ws.close();
+    }
+    isConnected() {
+        return this.wsConnected;
     }
     cairo(command, ...params) {
         return this.sendMessage({ command: command, params: params });
@@ -91,60 +75,46 @@ class CamOverlayDrawingAPI extends EventEmitter {
     removeImage() {
         return this.sendMessage({ command: 'remove_image_v2' });
     }
-    openWebsocket() {
-        return new Promise((resolve, reject) => {
-            const options = {
-                ip: this.ip,
-                port: this.port,
-                address: '/local/camoverlay/ws',
-                protocol: 'cairo-api',
-                user: this.user,
-                pass: this.pass,
-                tls: this.tls,
-                tlsInsecure: this.tlsInsecure,
-            };
-            this.ws = new WsClient_1.WsClient(options);
-            this.ws.on('open', () => {
-                this.emit('open');
-                resolve();
-            });
-            this.ws.on('message', (data) => {
-                const dataJSON = JSON.parse(data.toString());
-                if (Object.hasOwn(dataJSON, 'call_id') && dataJSON['call_id'] in this.sendMessages) {
-                    if (Object.hasOwn(dataJSON, 'error')) {
-                        this.sendMessages[dataJSON.call_id].reject(new Error(dataJSON.error));
-                    }
-                    else {
-                        this.sendMessages[dataJSON.call_id].resolve(dataJSON);
-                    }
-                    delete this.sendMessages[dataJSON['call_id']];
-                }
+    createWsClient() {
+        const options = {
+            ip: this.ip,
+            port: this.port,
+            address: '/local/camoverlay/ws',
+            protocol: 'cairo-api',
+            user: this.user,
+            pass: this.pass,
+            tls: this.tls,
+            tlsInsecure: this.tlsInsecure,
+        };
+        this.ws = new WsClient_1.WsClient(options);
+        this.ws.on('open', () => {
+            this.wsConnected = true;
+            this.emit('open');
+        });
+        this.ws.on('message', (data) => {
+            const dataJSON = JSON.parse(data.toString());
+            if (Object.hasOwn(dataJSON, 'call_id') && dataJSON['call_id'] in this.sendMessages) {
                 if (Object.hasOwn(dataJSON, 'error')) {
-                    this.reportError(new Error(dataJSON.error));
+                    this.sendMessages[dataJSON.call_id].reject(new Error(dataJSON.error));
                 }
                 else {
-                    this.reportMessage(data.toString());
-                }
-            });
-            this.ws.on('error', (error) => {
-                this.reportError(error);
-                reject(error);
-            });
-            this.ws.on('close', () => __awaiter(this, void 0, void 0, function* () {
-                this.ws = undefined;
-                this.reportClose();
-                if (this.connected) {
-                    try {
-                        yield (0, promises_1.setTimeout)(10000);
-                        yield this.openWebsocket();
-                        resolve();
-                    }
-                    catch (err) {
-                        reject(err);
-                    }
+                    this.sendMessages[dataJSON.call_id].resolve(dataJSON);
                 }
-            }));
-            this.ws.open();
+                delete this.sendMessages[dataJSON['call_id']];
+            }
+            if (Object.hasOwn(dataJSON, 'error')) {
+                this.reportError(new Error(dataJSON.error));
+            }
+            else {
+                this.reportMessage(data.toString());
+            }
+        });
+        this.ws.on('error', (error) => {
+            this.reportError(error);
+        });
+        this.ws.on('close', () => {
+            this.wsConnected = false;
+            this.reportClose();
         });
     }
     sendMessage(msgJson) {
@@ -152,13 +122,13 @@ class CamOverlayDrawingAPI extends EventEmitter {
             try {
                 this.sendMessages[this.callId] = { resolve, reject };
                 msgJson['call_id'] = this.callId++;
-                if (this.ws === undefined) {
+                if (!this.wsConnected) {
                     throw new Error('No CamOverlay connection');
                 }
                 this.ws.send(JSON.stringify(msgJson));
             }
             catch (err) {
-                const errorMessage = (err instanceof Error) ? err.message : err;
+                const errorMessage = err instanceof Error ? err.message : err;
                 this.reportError(new Error(`Send message error: ${errorMessage}`));
             }
         });
@@ -174,13 +144,13 @@ class CamOverlayDrawingAPI extends EventEmitter {
                 headerView.setInt8(0, 1);
                 headerView.setInt32(1, jsonBuffer.byteLength);
                 const msgBuffer = Buffer.concat([Buffer.from(header), jsonBuffer, data]);
-                if (this.ws === undefined) {
+                if (!this.wsConnected) {
                     throw new Error('No CamOverlay connection');
                 }
                 this.ws.send(msgBuffer);
             }
             catch (err) {
-                const errorMessage = (err instanceof Error) ? err.message : err;
+                const errorMessage = err instanceof Error ? err.message : err;
                 this.reportError(new Error(`Send binary message error: ${errorMessage}`));
             }
         });
@@ -189,9 +159,6 @@ class CamOverlayDrawingAPI extends EventEmitter {
         this.emit('message', msg);
     }
     reportError(err) {
-        if (this.ws !== undefined) {
-            this.ws.close();
-        }
         this.emit('error', err);
     }
     reportClose() {

package/CamOverlayPainter/Painter.d.ts

@@ -18,8 +18,9 @@ export default class Painter extends Frame {
     get camOverlayDrawingAPI(): CamOverlayDrawingAPI;
     get resourceManager(): ResourceManager;
     constructor(opt: PainterOptions, coopt: CamOverlayDrawingOptions);
-    connect(): Promise<void>;
+    connect(): void;
     disconnect(): void;
+    isConnected(): boolean;
     registerImage(moniker: string, fileName: string): void;
     registerFont(moniker: string, fileName: string): void;
     setScreenSize(sw: number, sh: number): void;

package/CamOverlayPainter/Painter.js

@@ -42,16 +42,20 @@ class Painter extends Frame_1.Frame {
         this.rm = new ResourceManager_1.default(this.cod);
     }
     connect() {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.cod.on('open', () => {
-                this.rm.clear();
-            });
-            return this.cod.connect();
+        this.cod.on('open', () => {
+            this.rm.clear();
+        });
+        this.cod.on('error', (err) => {
+            console.error('Painter:', err);
         });
+        this.cod.connect();
     }
     disconnect() {
         this.cod.disconnect();
     }
+    isConnected() {
+        return this.cod.isConnected();
+    }
     registerImage(moniker, fileName) {
         this.rm.registerImage(moniker, fileName);
     }

package/CamScripterAPICameraEventsGenerator.d.ts

@@ -1,7 +1,9 @@
 /// <reference types="node" />
 import * as EventEmitter from 'events';
-import { Options } from './internal/common';
-export type CamScripterOptions = Options;
+import { WsOptions } from './internal/common';
+export type CamScripterOptions = WsOptions & {
+    camScripterAcapName?: string;
+};
 export type TDeclaration = {
     type?: '' | 'SOURCE' | 'DATA';
     namespace: string;
@@ -40,16 +42,19 @@ export declare class CamScripterAPICameraEventsGenerator extends EventEmitter {
     private port;
     private user;
     private pass;
+    private camScripterAcapName;
     private callId;
     private sendMessages;
-    private ws?;
+    private wsConnected;
+    private ws;
     constructor(options?: CamScripterOptions);
-    connect(): Promise<void>;
+    connect(): void;
+    disconnect(): void;
     declareEvent(eventDeclaration: TEventDeclaration): Promise<TResponse>;
     undeclareEvent(eventUndeclaration: TEventUndeclaration): Promise<TResponse>;
     sendEvent(event: TEvent): Promise<TResponse>;
+    private createWsClient;
     private sendMessage;
-    private openWebsocket;
     private reportErr;
     private reportClose;
 }

package/CamScripterAPICameraEventsGenerator.js

@@ -1,20 +1,11 @@
 "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.CamScripterAPICameraEventsGenerator = void 0;
 const EventEmitter = require("events");
 const WsClient_1 = require("./internal/WsClient");
 class CamScripterAPICameraEventsGenerator extends EventEmitter {
     constructor(options) {
-        var _a, _b, _c, _d, _e, _f;
+        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;
@@ -22,20 +13,18 @@ class CamScripterAPICameraEventsGenerator extends EventEmitter {
         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.camScripterAcapName = (_g = options === null || options === void 0 ? void 0 : options.camScripterAcapName) !== null && _g !== void 0 ? _g : 'camscripter';
         this.callId = 0;
         this.sendMessages = {};
+        this.wsConnected = false;
+        this.createWsClient();
         EventEmitter.call(this);
     }
     connect() {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                yield this.openWebsocket();
-                this.emit('open');
-            }
-            catch (err) {
-                this.reportErr(err);
-            }
-        });
+        this.ws.open();
+    }
+    disconnect() {
+        this.ws.close();
     }
     declareEvent(eventDeclaration) {
         return this.sendMessage({
@@ -58,9 +47,48 @@ class CamScripterAPICameraEventsGenerator extends EventEmitter {
             data: event,
         });
     }
+    createWsClient() {
+        const options = {
+            user: this.user,
+            pass: this.pass,
+            tlsInsecure: this.tlsInsecure,
+            tls: this.tls,
+            ip: this.ip,
+            port: this.port,
+            address: `/local/${this.camScripterAcapName}/ws`,
+            protocol: 'camera-events',
+        };
+        this.ws = new WsClient_1.WsClient(options);
+        this.ws.on('open', () => {
+            this.wsConnected = true;
+            this.emit('open');
+        });
+        this.ws.on('message', (data) => {
+            const dataJSON = JSON.parse(data.toString());
+            if (Object.hasOwn(dataJSON, 'call_id') && dataJSON['call_id'] in this.sendMessages) {
+                if (Object.hasOwn(dataJSON, 'error')) {
+                    this.sendMessages[dataJSON['call_id']].reject(new Error(dataJSON.error));
+                }
+                else {
+                    this.sendMessages[dataJSON['call_id']].resolve(dataJSON);
+                }
+                delete this.sendMessages[dataJSON['call_id']];
+            }
+            if (Object.hasOwn(dataJSON, 'error')) {
+                this.reportErr(new Error(dataJSON.error));
+            }
+        });
+        this.ws.on('error', (error) => {
+            this.reportErr(error);
+        });
+        this.ws.on('close', () => {
+            this.wsConnected = false;
+            this.reportClose();
+        });
+    }
     sendMessage(msgJson) {
         return new Promise((resolve, reject) => {
-            if (this.ws === undefined) {
+            if (!this.wsConnected) {
                 throw new Error("Websocket hasn't been opened yet.");
             }
             try {
@@ -73,50 +101,7 @@ class CamScripterAPICameraEventsGenerator extends EventEmitter {
             }
         });
     }
-    openWebsocket() {
-        return new Promise((resolve, reject) => {
-            const options = {
-                user: this.user,
-                pass: this.pass,
-                tlsInsecure: this.tlsInsecure,
-                tls: this.tls,
-                ip: this.ip,
-                port: this.port,
-                address: '/local/camscripter/ws',
-                protocol: 'camera-events',
-            };
-            this.ws = new WsClient_1.WsClient(options);
-            this.ws.on('open', () => {
-                resolve();
-            });
-            this.ws.on('message', (data) => {
-                const dataJSON = JSON.parse(data.toString());
-                if (Object.hasOwn(dataJSON, 'call_id') && dataJSON['call_id'] in this.sendMessages) {
-                    if (Object.hasOwn(dataJSON, 'error')) {
-                        this.sendMessages[dataJSON['call_id']].reject(new Error(dataJSON.error));
-                    }
-                    else {
-                        this.sendMessages[dataJSON['call_id']].resolve(dataJSON);
-                    }
-                    delete this.sendMessages[dataJSON['call_id']];
-                }
-                if (Object.hasOwn(dataJSON, 'error')) {
-                    this.reportErr(new Error(dataJSON.error));
-                }
-            });
-            this.ws.on('error', (error) => {
-                this.reportErr(error);
-                reject(error);
-            });
-            this.ws.on('close', () => {
-                this.reportClose();
-            });
-            this.ws.open();
-        });
-    }
     reportErr(err) {
-        var _a;
-        (_a = this.ws) === null || _a === void 0 ? void 0 : _a.close();
         this.emit('error', err);
     }
     reportClose() {

package/CamStreamerAPI.d.ts

@@ -1,5 +1,5 @@
-import { Options, IClient } from './internal/common';
-export type CamStreamerAPIOptions = Options;
+import { IClient, HttpOptions } from './internal/common';
+export type CamStreamerAPIOptions = HttpOptions;
 export type TStreamAttributes = {
     enabled: string;
     active: string;

package/CamSwitcherAPI.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 import * as EventEmitter from 'events';
-import { IClient, Options } from './internal/common';
-export type CamSwitcherAPIOptions = Options;
+import { HttpOptions, IClient } from './internal/common';
+export type CamSwitcherAPIOptions = HttpOptions;
 export type TStreamInfo = {
     id: string;
     isTimeoutCustom: boolean;

package/CamSwitcherEvents.d.ts

@@ -1,17 +1,19 @@
 /// <reference types="node" />
 import * as EventEmitter from 'events';
-import { Options } from './internal/common';
-export type CamSwitcherEventsOptions = Options;
+import { HttpOptions } from './internal/common';
+export type CamSwitcherEventsOptions = HttpOptions;
 export declare class CamSwitcherEvents extends EventEmitter {
-    private ws?;
-    private client;
     private tls;
     private tlsInsecure;
     private ip;
     private port;
     private user;
     private pass;
+    private client;
+    private ws;
     constructor(options?: CamSwitcherEventsOptions);
-    connect(): Promise<void>;
+    connect(): void;
+    disconnect(): void;
+    private createWsClient;
     private get;
 }

package/CamSwitcherEvents.js

@@ -24,48 +24,54 @@ class CamSwitcherEvents extends EventEmitter {
         this.user = (_e = options.user) !== null && _e !== void 0 ? _e : 'root';
         this.pass = (_f = options.pass) !== null && _f !== void 0 ? _f : '';
         this.client = new DefaultAgent_1.DefaultAgent(options);
+        this.createWsClient();
         EventEmitter.call(this);
     }
     connect() {
-        return __awaiter(this, void 0, void 0, function* () {
+        this.ws.open();
+    }
+    disconnect() {
+        this.ws.close();
+    }
+    createWsClient() {
+        const options = {
+            ip: this.ip,
+            port: this.port,
+            user: this.user,
+            pass: this.pass,
+            tls: this.tls,
+            tlsInsecure: this.tlsInsecure,
+            address: '/local/camswitcher/events',
+            protocol: 'events',
+        };
+        this.ws = new WsClient_1.WsClient(options);
+        this.ws.on('open', () => __awaiter(this, void 0, void 0, function* () {
             try {
                 const token = yield this.get('/local/camswitcher/ws_authorization.cgi');
-                const options = {
-                    ip: this.ip,
-                    port: this.port,
-                    user: this.user,
-                    pass: this.pass,
-                    tls: this.tls,
-                    tlsInsecure: this.tlsInsecure,
-                    address: '/local/camswitcher/events',
-                    protocol: 'events',
-                };
-                this.ws = new WsClient_1.WsClient(options);
-                this.ws.on('open', () => {
-                    var _a;
-                    (_a = this.ws) === null || _a === void 0 ? void 0 : _a.send(JSON.stringify({ authorization: token }));
-                });
-                this.ws.on('message', (data) => {
-                    try {
-                        const parsedData = JSON.parse(data.toString());
-                        this.emit('event', parsedData);
-                    }
-                    catch (err) {
-                        console.log(err);
-                    }
-                });
-                this.ws.on('close', () => {
-                    this.emit('event_connection_close');
-                });
-                this.ws.on('error', (err) => {
-                    this.emit('event_connection_error', err);
-                });
+                this.ws.send(JSON.stringify({ authorization: token }));
+                this.emit('open');
+            }
+            catch (err) {
+                this.emit('error', err);
+                this.ws.close();
                 this.ws.open();
             }
+        }));
+        this.ws.on('message', (data) => {
+            try {
+                const parsedData = JSON.parse(data.toString());
+                this.emit('event', parsedData);
+            }
             catch (err) {
-                this.emit('event_connection_error', err);
+                console.error(err);
             }
         });
+        this.ws.on('error', (err) => {
+            this.emit('error', err);
+        });
+        this.ws.on('close', () => {
+            this.emit('close');
+        });
     }
     get(path) {
         return __awaiter(this, void 0, void 0, function* () {

package/CameraVapix.d.ts

@@ -2,8 +2,8 @@
 /// <reference types="node" />
 import { WritableStream } from 'node:stream/web';
 import { EventEmitter2 as EventEmitter } from 'eventemitter2';
-import { IClient, Options } from './internal/common';
-export type CameraVapixOptions = Options;
+import { HttpOptions, IClient } from './internal/common';
+export type CameraVapixOptions = HttpOptions;
 export type TApplicationList = {
     reply: {
         $: {

package/CameraVapix.js

@@ -40,12 +40,12 @@ class CameraVapix extends eventemitter2_1.EventEmitter2 {
             const response = yield (yield this.vapixGet(`/axis-cgi/param.cgi?action=list&group=${encodeURIComponent(groupNames)}`)).text();
             const params = {};
             const lines = response.split(/[\r\n]/);
-            for (let i = 0; i < lines.length; i++) {
-                if (lines[i].length) {
-                    const p = lines[i].split('=');
-                    if (p.length >= 2) {
-                        params[p[0]] = p[1];
-                    }
+            for (const line of lines) {
+                const delimiterPos = line.indexOf('=');
+                if (delimiterPos !== -1) {
+                    const key = line.substring(0, delimiterPos);
+                    const value = line.substring(delimiterPos + 1);
+                    params[key] = value;
                 }
             }
             return params;
@@ -65,10 +65,11 @@ class CameraVapix extends eventemitter2_1.EventEmitter2 {
             const positions = [];
             const lines = response.split(/[\r\n]/);
             for (const line of lines) {
-                if (line.length > 0 && line.indexOf('presetposno') !== -1) {
-                    const p = line.split('=');
-                    if (p.length >= 2) {
-                        positions.push(p[1]);
+                if (line.indexOf('presetposno') !== -1) {
+                    const delimiterPos = line.indexOf('=');
+                    if (delimiterPos !== -1) {
+                        const value = line.substring(delimiterPos + 1);
+                        positions.push(value);
                     }
                 }
             }