camstreamerlib 1.9.0 → 2.0.0

package/CamOverlayDrawingAPI.js

@@ -0,0 +1,176 @@
+"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 WsClient_1 = require("./WsClient");
+class CamOverlayDrawingAPI extends EventEmitter {
+    constructor(options) {
+        var _a, _b, _c, _d, _e, _f;
+        super();
+        this.ws = null;
+        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.auth = (_e = options === null || options === void 0 ? void 0 : options.auth) !== null && _e !== void 0 ? _e : '';
+        this.zIndex = (_f = options === null || options === void 0 ? void 0 : options.zIndex) !== null && _f !== void 0 ? _f : 0;
+        this.cameraList = [0];
+        if (Array.isArray(options === null || options === void 0 ? void 0 : options.camera)) {
+            this.cameraList = options.camera;
+        }
+        else if (typeof (options === null || options === void 0 ? void 0 : options.camera) === 'number') {
+            this.cameraList = [options.camera];
+        }
+        this.callId = 0;
+        this.sendMessages = {};
+        EventEmitter.call(this);
+    }
+    connect() {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                yield this.openWebsocket();
+                this.emit('open');
+            }
+            catch (err) {
+                this.reportError(err);
+            }
+        });
+    }
+    cairo(command, ...params) {
+        return this.sendMessage({ command: command, params: params });
+    }
+    writeText(...params) {
+        return this.sendMessage({ command: 'write_text', params: params });
+    }
+    uploadImageData(imgBuffer) {
+        return this.sendBinaryMessage({
+            command: 'upload_image_data',
+            params: [],
+        }, imgBuffer);
+    }
+    uploadFontData(fontBuffer) {
+        return this.sendBinaryMessage({
+            command: 'upload_font_data',
+            params: [fontBuffer.toString('base64')],
+        }, fontBuffer);
+    }
+    showCairoImage(cairoImage, posX, posY) {
+        return this.sendMessage({
+            command: 'show_cairo_image_v2',
+            params: [cairoImage, posX, posY, this.cameraList, this.zIndex],
+        });
+    }
+    showCairoImageAbsolute(cairoImage, posX, posY, width, height) {
+        return this.sendMessage({
+            command: 'show_cairo_image_v2',
+            params: [
+                cairoImage,
+                -1.0 + (2.0 / width) * posX,
+                -1.0 + (2.0 / height) * posY,
+                this.cameraList,
+                this.zIndex,
+            ],
+        });
+    }
+    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',
+                auth: this.auth,
+                tls: this.tls,
+                tlsInsecure: this.tlsInsecure,
+            };
+            this.ws = new WsClient_1.WsClient(options);
+            this.ws.on('open', () => {
+                this.reportMessage('Websocket opened');
+                resolve();
+            });
+            this.ws.on('message', (data) => {
+                let dataJSON = JSON.parse(data.toString());
+                if (dataJSON.hasOwnProperty('call_id') && dataJSON['call_id'] in this.sendMessages) {
+                    if (dataJSON.hasOwnProperty('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 (dataJSON.hasOwnProperty('error')) {
+                    this.reportError(new Error(dataJSON.error));
+                }
+                else {
+                    this.reportMessage(data.toString());
+                }
+            });
+            this.ws.on('error', (error) => {
+                this.reportError(error);
+                reject(error);
+            });
+            this.ws.on('close', () => {
+                this.reportClose();
+            });
+            this.ws.open();
+        });
+    }
+    sendMessage(msgJson) {
+        return new Promise((resolve, reject) => {
+            try {
+                this.sendMessages[this.callId] = { resolve, reject };
+                msgJson['call_id'] = this.callId++;
+                this.ws.send(JSON.stringify(msgJson));
+            }
+            catch (err) {
+                this.reportError(new Error(`Send message error: ${err}`));
+            }
+        });
+    }
+    sendBinaryMessage(msgJson, data) {
+        return new Promise((resolve, reject) => {
+            try {
+                this.sendMessages[this.callId] = { resolve, reject };
+                msgJson['call_id'] = this.callId++;
+                const jsonBuffer = Buffer.from(JSON.stringify(msgJson));
+                const header = new ArrayBuffer(5);
+                const headerView = new DataView(header);
+                headerView.setInt8(0, 1);
+                headerView.setInt32(1, jsonBuffer.byteLength);
+                const msgBuffer = Buffer.concat([Buffer.from(header), jsonBuffer, data]);
+                this.ws.send(msgBuffer);
+            }
+            catch (err) {
+                this.reportError(new Error(`Send binary message error: ${err}`));
+            }
+        });
+    }
+    reportMessage(msg) {
+        this.emit('message', msg);
+    }
+    reportError(err) {
+        this.ws.close();
+        this.emit('error', err);
+    }
+    reportClose() {
+        for (const callId in this.sendMessages) {
+            this.sendMessages[callId].reject(new Error('Connection lost'));
+        }
+        this.sendMessages = {};
+        this.emit('close');
+    }
+}
+exports.CamOverlayDrawingAPI = CamOverlayDrawingAPI;

package/CamScripterAPICameraEventsGenerator.d.ts

@@ -1,13 +1,8 @@
 /// <reference types="node" />
 import * as EventEmitter from 'events';
-export declare type CamScripterOptions = {
-    tls?: boolean;
-    tlsInsecure?: boolean;
-    ip?: string;
-    port?: number;
-    auth?: string;
-};
-export declare type Declaration = {
+import { Options } from './common';
+export type CamScripterOptions = Options;
+export type Declaration = {
     type?: '' | 'SOURCE' | 'DATA';
     namespace: string;
     key: string;
@@ -16,25 +11,25 @@ export declare type Declaration = {
     key_nice_name?: string;
     value_nice_name?: string;
 };
-export declare type EventDeclaration = {
+export type EventDeclaration = {
     declaration_id: string;
     stateless: boolean;
     declaration: Declaration[];
 };
-export declare type EventUndeclaration = {
+export type EventUndeclaration = {
     declaration_id: string;
 };
-export declare type EventData = {
+export type EventData = {
     namespace: string;
     key: string;
     value: string | boolean | number;
     value_type: 'STRING' | 'INT' | 'BOOL' | 'DOUBLE';
 };
-export declare type Event = {
+export type Event = {
     declaration_id: string;
     event_data: EventData[];
 };
-export declare type Response = {
+export type Response = {
     call_id: number;
     message: string;
 };
@@ -49,11 +44,11 @@ export declare class CamScripterAPICameraEventsGenerator extends EventEmitter {
     private ws;
     constructor(options?: CamScripterOptions);
     connect(): Promise<void>;
-    private openWebsocket;
     declareEvent(eventDeclaration: EventDeclaration): Promise<Response>;
     undeclareEvent(eventUndeclaration: EventUndeclaration): Promise<Response>;
     sendEvent(event: Event): Promise<Response>;
     private sendMessage;
+    private openWebsocket;
     private reportErr;
     private reportClose;
 }

package/CamScripterAPICameraEventsGenerator.js

@@ -10,9 +10,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CamScripterAPICameraEventsGenerator = void 0;
-const WebSocket = require("ws");
 const EventEmitter = require("events");
-const Digest_1 = require("./Digest");
+const WsClient_1 = require("./WsClient");
 class CamScripterAPICameraEventsGenerator extends EventEmitter {
     constructor(options) {
         var _a, _b, _c, _d, _e;
@@ -38,67 +37,6 @@ class CamScripterAPICameraEventsGenerator extends EventEmitter {
             }
         });
     }
-    openWebsocket(digestHeader) {
-        return new Promise((resolve, reject) => {
-            const userPass = this.auth.split(':');
-            const protocol = this.tls ? 'wss' : 'ws';
-            const addr = `${protocol}://${this.ip}:${this.port}/local/camscripter/ws`;
-            const options = {
-                auth: this.auth,
-                rejectUnauthorized: !this.tlsInsecure,
-                headers: {},
-            };
-            if (digestHeader !== undefined) {
-                options.headers['Authorization'] = Digest_1.Digest.getAuthHeader(userPass[0], userPass[1], 'GET', '/local/camscripter/ws', digestHeader);
-            }
-            this.ws = new WebSocket(addr, 'camera-events', options);
-            this.ws.binaryType = 'arraybuffer';
-            this.ws.isAlive = true;
-            const pingTimer = setInterval(() => {
-                if (this.ws.readyState !== this.ws.OPEN || this.ws.isAlive === false) {
-                    return this.ws.terminate();
-                }
-                this.ws.isAlive = false;
-                this.ws.ping();
-            }, 30000);
-            this.ws.on('open', () => {
-                resolve();
-            });
-            this.ws.on('pong', () => {
-                this.ws.isAlive = true;
-            });
-            this.ws.on('message', (data) => {
-                const dataJSON = JSON.parse(data);
-                if (dataJSON.hasOwnProperty('call_id') && dataJSON['call_id'] in this.sendMessages) {
-                    if (dataJSON.hasOwnProperty('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 (dataJSON.hasOwnProperty('error')) {
-                    this.reportErr(new Error(dataJSON.error));
-                }
-            });
-            this.ws.on('unexpected-response', (req, res) => __awaiter(this, void 0, void 0, function* () {
-                if (res.statusCode === 401 && res.headers['www-authenticate'] !== undefined)
-                    this.openWebsocket(res.headers['www-authenticate']).then(resolve, reject);
-                else {
-                    reject('Error: status code: ' + res.statusCode + ', ' + res.data);
-                }
-            }));
-            this.ws.on('error', (error) => {
-                this.reportErr(error);
-                reject(error);
-            });
-            this.ws.on('close', () => {
-                clearInterval(pingTimer);
-                this.reportClose();
-            });
-        });
-    }
     declareEvent(eventDeclaration) {
         return this.sendMessage({
             call_id: 0,
@@ -132,9 +70,48 @@ class CamScripterAPICameraEventsGenerator extends EventEmitter {
             }
         });
     }
+    openWebsocket() {
+        return new Promise((resolve, reject) => {
+            const options = {
+                auth: this.auth,
+                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 (dataJSON.hasOwnProperty('call_id') && dataJSON['call_id'] in this.sendMessages) {
+                    if (dataJSON.hasOwnProperty('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 (dataJSON.hasOwnProperty('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.terminate();
+        this.ws.close();
         this.emit('error', err);
     }
     reportClose() {

package/CamStreamerAPI.d.ts

@@ -1,11 +1,5 @@
-export declare type CamStreamerAPIOptions = {
-    protocol?: string;
-    tls?: boolean;
-    tlsInsecure?: boolean;
-    ip?: string;
-    port?: number;
-    auth?: string;
-};
+import { Options } from './common';
+export type CamStreamerAPIOptions = Options;
 export declare class CamStreamerAPI {
     private tls;
     private tlsInsecure;

package/CamStreamerAPI.js

@@ -10,14 +10,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CamStreamerAPI = void 0;
-const HTTPRequest_1 = require("./HTTPRequest");
+const HttpRequest_1 = require("./HttpRequest");
 class CamStreamerAPI {
     constructor(options) {
         var _a, _b, _c, _d, _e;
         this.tls = (_a = options === null || options === void 0 ? void 0 : options.tls) !== null && _a !== void 0 ? _a : false;
-        if ((options === null || options === void 0 ? void 0 : options.tls) === undefined && (options === null || options === void 0 ? void 0 : options.protocol) !== undefined) {
-            this.tls = options.protocol === 'https';
-        }
         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);
@@ -50,7 +47,7 @@ class CamStreamerAPI {
         return __awaiter(this, void 0, void 0, function* () {
             const options = this.getBaseConnectionParams();
             options.path = encodeURI(path);
-            const data = (yield (0, HTTPRequest_1.httpRequest)(options));
+            const data = (yield (0, HttpRequest_1.httpRequest)(options));
             return JSON.parse(data);
         });
     }

package/CamSwitcherAPI.d.ts

@@ -1,12 +1,7 @@
 /// <reference types="node" />
 import * as EventEmitter from 'events';
-export declare type CamSwitcherAPIOptions = {
-    tls?: boolean;
-    tlsInsecure?: boolean;
-    ip?: string;
-    port?: number;
-    auth?: string;
-};
+import { Options } from './common';
+export type CamSwitcherAPIOptions = Options;
 export declare class CamSwitcherAPI extends EventEmitter {
     private tls;
     private tlsInsecure;
@@ -14,8 +9,7 @@ export declare class CamSwitcherAPI extends EventEmitter {
     private port;
     private auth;
     private ws;
-    private pingTimer;
-    constructor(options: CamSwitcherAPIOptions);
+    constructor(options?: CamSwitcherAPIOptions);
     connect(): Promise<void>;
     getPlaylistList(): Promise<object>;
     getClipList(): Promise<object>;

package/CamSwitcherAPI.js

@@ -10,9 +10,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CamSwitcherAPI = void 0;
-const WebSocket = require("ws");
 const EventEmitter = require("events");
-const HTTPRequest_1 = require("./HTTPRequest");
+const WsClient_1 = require("./WsClient");
+const HttpRequest_1 = require("./HttpRequest");
 class CamSwitcherAPI extends EventEmitter {
     constructor(options) {
         var _a, _b, _c, _d, _e;
@@ -20,7 +20,7 @@ class CamSwitcherAPI extends EventEmitter {
         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 : 80;
+        this.port = (_d = options === null || options === void 0 ? void 0 : options.port) !== null && _d !== void 0 ? _d : (this.tls ? 443 : 80);
         this.auth = (_e = options === null || options === void 0 ? void 0 : options.auth) !== null && _e !== void 0 ? _e : '';
         EventEmitter.call(this);
     }
@@ -28,28 +28,22 @@ class CamSwitcherAPI extends EventEmitter {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 const token = yield this.get('/local/camswitcher/ws_authorization.cgi');
-                const protocol = this.tls ? 'wss' : 'ws';
-                this.ws = new WebSocket(`${protocol}://${this.ip}:${this.port}/local/camswitcher/events`, 'events', {
-                    rejectUnauthorized: !this.tlsInsecure,
-                });
-                this.pingTimer = null;
+                const options = {
+                    ip: this.ip,
+                    port: this.port,
+                    auth: this.auth,
+                    tls: this.tls,
+                    tlsInsecure: this.tlsInsecure,
+                    address: '/local/camswitcher/events',
+                    protocol: 'events',
+                };
+                this.ws = new WsClient_1.WsClient(options);
                 this.ws.on('open', () => {
                     this.ws.send(JSON.stringify({ authorization: token }));
-                    this.ws.isAlive = true;
-                    this.pingTimer = setInterval(() => {
-                        if (this.ws.isAlive === false) {
-                            return this.ws.terminate();
-                        }
-                        this.ws.isAlive = false;
-                        this.ws.ping();
-                    }, 30000);
-                });
-                this.ws.on('pong', () => {
-                    this.ws.isAlive = true;
                 });
                 this.ws.on('message', (data) => {
                     try {
-                        const parsedData = JSON.parse(data);
+                        const parsedData = JSON.parse(data.toString());
                         this.emit('event', parsedData);
                     }
                     catch (err) {
@@ -57,12 +51,12 @@ class CamSwitcherAPI extends EventEmitter {
                     }
                 });
                 this.ws.on('close', () => {
-                    clearInterval(this.pingTimer);
                     this.emit('event_connection_close');
                 });
                 this.ws.on('error', (err) => {
                     this.emit('event_connection_error', err);
                 });
+                this.ws.open();
             }
             catch (err) {
                 this.emit('event_connection_error', err);
@@ -97,7 +91,7 @@ class CamSwitcherAPI extends EventEmitter {
         return __awaiter(this, void 0, void 0, function* () {
             const options = this.getBaseConnectionParams();
             options.path = encodeURI(path);
-            const data = (yield (0, HTTPRequest_1.httpRequest)(options));
+            const data = (yield (0, HttpRequest_1.httpRequest)(options));
             try {
                 const response = JSON.parse(data);
                 if (response.status == 200) {

package/CameraVapix.d.ts

@@ -2,15 +2,9 @@
 /// <reference types="node" />
 import * as http from 'http';
 import { EventEmitter2 as EventEmitter } from 'eventemitter2';
-export declare type CameraVapixOptions = {
-    protocol?: string;
-    tls?: boolean;
-    tlsInsecure?: boolean;
-    ip?: string;
-    port?: number;
-    auth?: string;
-};
-export declare type ApplicationList = {
+import { Options } from './common';
+export type CameraVapixOptions = Options;
+export type ApplicationList = {
     reply: {
         $: {
             result: string;
@@ -20,7 +14,7 @@ export declare type ApplicationList = {
         }[];
     };
 };
-export declare type Application = {
+export type Application = {
     Name: string;
     NiceName: string;
     Vendor: string;
@@ -32,7 +26,7 @@ export declare type Application = {
     VendorHomePage?: string;
     LicenseName?: string;
 };
-export declare type GuardTour = {
+export type GuardTour = {
     id: string;
     camNbr: any;
     name: string;
@@ -53,9 +47,10 @@ export declare class CameraVapix extends EventEmitter {
     private ip;
     private port;
     private auth;
-    private rtsp;
     private ws;
     constructor(options?: CameraVapixOptions);
+    vapixGet(path: string, noWaitForData?: boolean): Promise<string | http.IncomingMessage>;
+    vapixPost(path: string, data: string, contentType?: string): Promise<string>;
     getParameterGroup(groupNames: string): Promise<{}>;
     setParameter(params: object): Promise<string>;
     getPTZPresetList(channel: string): Promise<string[]>;
@@ -65,14 +60,10 @@ export declare class CameraVapix extends EventEmitter {
     getInputState(port: number): Promise<boolean>;
     setOutputState(port: number, active: boolean): Promise<string>;
     getApplicationList(): Promise<Application[]>;
+    getCameraImage(camera: string, compression: string, resolution: string, outputStream: NodeJS.WritableStream): Promise<NodeJS.WritableStream>;
     getEventDeclarations(): Promise<string>;
-    private isReservedEventName;
-    eventsConnect(channel?: string): void;
+    eventsConnect(): void;
     eventsDisconnect(): void;
-    private rtspConnect;
-    private websocketConnect;
-    vapixGet(path: string, noWaitForData?: boolean): Promise<string | http.IncomingMessage>;
-    getCameraImage(camera: string, compression: string, resolution: string, outputStream: NodeJS.WritableStream): Promise<NodeJS.WritableStream>;
-    vapixPost(path: string, data: string, contentType?: string): Promise<string>;
+    private isReservedEventName;
     private getBaseVapixConnectionParams;
 }