camstreamerlib 3.0.0 → 3.2.0

package/CamOverlayAPI.d.ts

@@ -1,5 +1,6 @@
-import { Options } from './internal/common';
-export type CamOverlayOptions = Options;
+/// <reference types="node" />
+import { HttpOptions, IClient } from './internal/common';
+export type CamOverlayOptions = HttpOptions;
 export type TField = {
     field_name: string;
     text: string;
@@ -21,13 +22,8 @@ export declare enum ImageType {
     JPEG = 1
 }
 export declare class CamOverlayAPI {
-    private tls;
-    private tlsInsecure;
-    private ip;
-    private port;
-    private user;
-    private pass;
-    constructor(options?: CamOverlayOptions);
+    private client;
+    constructor(options?: CamOverlayOptions | IClient);
     updateCGText(serviceID: number, fields: TField[]): Promise<void>;
     updateCGImagePos(serviceID: number, coordinates?: string, x?: number, y?: number): Promise<void>;
     updateCGImage(serviceID: number, path: string, coordinates?: string, x?: number, y?: number): Promise<void>;
@@ -38,5 +34,4 @@ export declare class CamOverlayAPI {
     updateCGImageFromData(serviceID: number, imageType: ImageType, imageData: Buffer, coordinates?: string, x?: number, y?: number): Promise<void>;
     promiseCGUpdate(serviceID: number, action: string, params: string, contentType?: string, data?: Buffer): Promise<void>;
     private formCoordinates;
-    private getBaseVapixConnectionParams;
 }

package/CamOverlayAPI.js

@@ -10,21 +10,21 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CamOverlayAPI = exports.ImageType = void 0;
-const HttpRequest_1 = require("./internal/HttpRequest");
+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 {
-    constructor(options) {
-        var _a, _b, _c, _d, _e, _f;
-        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 : '';
+    constructor(options = {}) {
+        if ((0, common_1.isClient)(options)) {
+            this.client = options;
+        }
+        else {
+            this.client = new DefaultAgent_1.DefaultAgent(options);
+        }
     }
     updateCGText(serviceID, fields) {
         let field_specs = '';
@@ -49,8 +49,7 @@ class CamOverlayAPI {
     updateInfoticker(serviceID, text) {
         return __awaiter(this, void 0, void 0, function* () {
             const path = `/local/camoverlay/api/infoticker.cgi?service_id=${serviceID}&text=${text}`;
-            const options = this.getBaseVapixConnectionParams(path);
-            const res = yield (0, HttpRequest_1.sendRequest)(options);
+            const res = yield this.client.get(path);
             if (!res.ok) {
                 throw new Error(JSON.stringify(res));
             }
@@ -59,8 +58,7 @@ class CamOverlayAPI {
     setEnabled(serviceID, enabled) {
         return __awaiter(this, void 0, void 0, function* () {
             const path = `/local/camoverlay/api/enabled.cgi?id_${serviceID}=${enabled ? 1 : 0}`;
-            const options = this.getBaseVapixConnectionParams(path, 'POST');
-            const res = yield (0, HttpRequest_1.sendRequest)(options);
+            const res = yield this.client.post(path, '');
             if (!res.ok) {
                 throw new Error(JSON.stringify(res));
             }
@@ -69,8 +67,7 @@ class CamOverlayAPI {
     isEnabled(serviceID) {
         return __awaiter(this, void 0, void 0, function* () {
             const path = '/local/camoverlay/api/services.cgi?action=get';
-            const options = this.getBaseVapixConnectionParams(path);
-            const res = yield (0, HttpRequest_1.sendRequest)(options);
+            const res = yield this.client.get(path);
             if (res.ok) {
                 const data = JSON.parse(yield res.text());
                 for (const service of data.services) {
@@ -88,8 +85,7 @@ class CamOverlayAPI {
     updateServices(servicesJson) {
         return __awaiter(this, void 0, void 0, function* () {
             const path = '/local/camoverlay/api/services.cgi?action=set';
-            const options = this.getBaseVapixConnectionParams(path, 'POST');
-            const res = yield (0, HttpRequest_1.sendRequest)(options, JSON.stringify(servicesJson));
+            const res = yield this.client.post(path, JSON.stringify(servicesJson));
             if (!res.ok) {
                 throw new Error(JSON.stringify(res));
             }
@@ -103,11 +99,11 @@ class CamOverlayAPI {
     promiseCGUpdate(serviceID, action, params, contentType, data) {
         return __awaiter(this, void 0, void 0, function* () {
             const path = `/local/camoverlay/api/customGraphics.cgi?action=${action}&service_id=${serviceID}${params}`;
-            const options = this.getBaseVapixConnectionParams(path, 'POST');
+            let headers = {};
             if (contentType !== undefined && data) {
-                options.headers = { 'Content-Type': contentType };
+                headers = { 'Content-Type': contentType };
             }
-            const res = yield (0, HttpRequest_1.sendRequest)(options, data);
+            const res = yield this.client.post(path, data !== null && data !== void 0 ? data : '', {}, headers);
             if (!res.ok) {
                 throw new Error(JSON.stringify(res));
             }
@@ -116,17 +112,5 @@ class CamOverlayAPI {
     formCoordinates(coordinates, x, y) {
         return coordinates !== '' ? `&coord_system=${coordinates}&pos_x=${x}&pos_y=${y}` : '';
     }
-    getBaseVapixConnectionParams(path, method = 'GET') {
-        return {
-            method: method,
-            protocol: this.tls ? 'https:' : 'http:',
-            host: this.ip,
-            port: this.port,
-            path: path,
-            user: this.user,
-            pass: this.pass,
-            rejectUnauthorized: !this.tlsInsecure,
-        };
-    }
 }
 exports.CamOverlayAPI = CamOverlayAPI;

package/CamOverlayDrawingAPI.d.ts

@@ -1,6 +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;
 };
@@ -43,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>;
@@ -55,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,58 +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);
-                        void this.openWebsocket();
-                    }
-                    catch (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) {
@@ -150,13 +122,14 @@ 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) {
-                this.reportError(new Error(`Send message error: ${err}`));
+                const errorMessage = err instanceof Error ? err.message : err;
+                this.reportError(new Error(`Send message error: ${errorMessage}`));
             }
         });
     }
@@ -171,13 +144,14 @@ 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) {
-                this.reportError(new Error(`Send binary message error: ${err}`));
+                const errorMessage = err instanceof Error ? err.message : err;
+                this.reportError(new Error(`Send binary message error: ${errorMessage}`));
             }
         });
     }
@@ -185,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/Frame.js

@@ -78,8 +78,8 @@ class Frame {
     disable() {
         this.enabled = false;
     }
-    displayImage(cod_1, rm_1, cairo_1, ppX_1, ppY_1) {
-        return __awaiter(this, arguments, void 0, function* (cod, rm, cairo, ppX, ppY, scale = 1) {
+    displayImage(cod, rm, cairo, ppX, ppY, scale = 1) {
+        return __awaiter(this, void 0, void 0, function* () {
             if (this.enabled) {
                 ppX += this.posX;
                 ppY += this.posY;

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);
     }
@@ -65,8 +69,8 @@ class Painter extends Frame_1.Frame {
     setCoAlignment(coa) {
         this.coAlignment = exports.COORD[coa];
     }
-    display() {
-        return __awaiter(this, arguments, void 0, function* (scale = 1) {
+    display(scale = 1) {
+        return __awaiter(this, void 0, void 0, function* () {
             if (this.enabled) {
                 [this.surface, this.cairo] = yield this.prepareDrawing(scale);
                 yield this.displayOwnImage(this.cod, this.rm, this.cairo, 0, 0, scale);

package/CamScripterAPICameraEventsGenerator.d.ts

@@ -1,6 +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;
@@ -39,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,17 +1,35 @@
-import { Options } from './internal/common';
-export type CamStreamerAPIOptions = Options;
+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>;
 export declare class CamStreamerAPI {
-    private tls;
-    private tlsInsecure;
-    private ip;
-    private port;
-    private user;
-    private pass;
-    constructor(options?: CamStreamerAPIOptions);
-    getStreamList(): Promise<any>;
-    getStreamParameter(streamID: string, paramName: string): Promise<any>;
-    setStreamParameter(streamID: string, paramName: string, value: string): Promise<any>;
-    isStreaming(streamID: string): Promise<any>;
+    private client;
+    constructor(options?: CamStreamerAPIOptions | IClient);
+    getStreamList(): Promise<TStreamList>;
+    getStreamParameter(streamID: string, paramName: string): Promise<string>;
+    setStreamParameter(streamID: string, paramName: string, value: string): Promise<void>;
+    isStreaming(streamID: string): Promise<boolean>;
     get(path: string): Promise<any>;
-    private getBaseConnectionParams;
 }