camstreamerlib 1.7.5 → 1.8.0

package/CamOverlayAPI.d.ts

@@ -3,6 +3,8 @@
 import * as EventEmitter from 'events';
 export declare type CamOverlayOptions = {
     protocol?: string;
+    tls?: boolean;
+    tlsInsecure?: boolean;
     ip?: string;
     port?: number;
     auth?: string;
@@ -36,7 +38,7 @@ export declare type UploadImageResponse = {
 export declare type Align = 'A_RIGHT' | 'A_LEFT' | 'A_CENTER';
 export declare type TextFit = 'TFM_SCALE' | 'TFM_TRUNCATE' | 'TFM_OVERFLOW';
 export declare type WriteTextParams = [string, string, number, number, number, number, Align, TextFit?];
-declare type Service = {
+export declare type Service = {
     id: number;
     enabled: number;
     schedule: string;
@@ -44,11 +46,12 @@ declare type Service = {
     identifier: string;
     camera: number;
 };
-declare type ServiceJson = {
+export declare type ServiceList = {
     services: Service[];
 };
 export declare class CamOverlayAPI extends EventEmitter {
-    private protocol;
+    private tls;
+    private tlsInsecure;
     private ip;
     private port;
     private auth;
@@ -61,7 +64,7 @@ export declare class CamOverlayAPI extends EventEmitter {
     constructor(options?: CamOverlayOptions);
     connect(): Promise<void>;
     createService(): Promise<number>;
-    updateServices(servicesJson: ServiceJson): Promise<void>;
+    updateServices(servicesJson: ServiceList): Promise<void>;
     openWebsocket(digestHeader?: string): Promise<void>;
     cairo(command: string, ...params: any[]): Promise<CairoResponse | CairoCreateResponse>;
     writeText(...params: WriteTextParams): Promise<CairoResponse>;
@@ -82,5 +85,5 @@ export declare class CamOverlayAPI extends EventEmitter {
     updateInfoticker(text: string): Promise<void>;
     setEnabled(enabled: boolean): Promise<void>;
     isEnabled(): Promise<boolean>;
+    private getBaseVapixConnectionParams;
 }
-export {};

package/CamOverlayAPI.js

@@ -16,16 +16,20 @@ const Digest_1 = require("./Digest");
 const HTTPRequest_1 = require("./HTTPRequest");
 class CamOverlayAPI extends EventEmitter {
     constructor(options) {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         super();
         this.ws = null;
-        this.protocol = (_a = options === null || options === void 0 ? void 0 : options.protocol) !== null && _a !== void 0 ? _a : 'ws';
-        this.ip = (_b = options === null || options === void 0 ? void 0 : options.ip) !== null && _b !== void 0 ? _b : '127.0.0.1';
-        this.port = ((_c = options === null || options === void 0 ? void 0 : options.port) !== null && _c !== void 0 ? _c : this.protocol == 'ws') ? 80 : 443;
-        this.auth = (_d = options === null || options === void 0 ? void 0 : options.auth) !== null && _d !== void 0 ? _d : '';
-        this.serviceName = (_e = options === null || options === void 0 ? void 0 : options.serviceName) !== null && _e !== void 0 ? _e : '';
-        this.serviceID = (_f = options === null || options === void 0 ? void 0 : options.serviceID) !== null && _f !== void 0 ? _f : -1;
-        this.camera = (_g = options === null || options === void 0 ? void 0 : options.camera) !== null && _g !== void 0 ? _g : 0;
+        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 === 'wss';
+        }
+        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.serviceName = (_f = options === null || options === void 0 ? void 0 : options.serviceName) !== null && _f !== void 0 ? _f : '';
+        this.serviceID = (_g = options === null || options === void 0 ? void 0 : options.serviceID) !== null && _g !== void 0 ? _g : -1;
+        this.camera = (_h = options === null || options === void 0 ? void 0 : options.camera) !== null && _h !== void 0 ? _h : 0;
         this.callId = 0;
         this.sendMessages = {};
         EventEmitter.call(this);
@@ -47,12 +51,9 @@ class CamOverlayAPI extends EventEmitter {
     createService() {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const options = {
-                host: this.ip,
-                port: this.port,
-                path: '/local/camoverlay/api/services.cgi?action=get',
-                auth: this.auth,
-            };
+            const options = this.getBaseVapixConnectionParams();
+            options.method = 'GET';
+            options.path = '/local/camoverlay/api/services.cgi?action=get';
             const response = (yield (0, HTTPRequest_1.httpRequest)(options));
             let servicesJson;
             try {
@@ -102,22 +103,20 @@ class CamOverlayAPI extends EventEmitter {
     }
     updateServices(servicesJson) {
         return __awaiter(this, void 0, void 0, function* () {
-            const options = {
-                method: 'POST',
-                host: this.ip,
-                port: this.port,
-                path: '/local/camoverlay/api/services.cgi?action=set',
-                auth: this.auth,
-            };
+            const options = this.getBaseVapixConnectionParams();
+            options.method = 'POST';
+            options.path = '/local/camoverlay/api/services.cgi?action=set';
             yield (0, HTTPRequest_1.httpRequest)(options, JSON.stringify(servicesJson));
         });
     }
     openWebsocket(digestHeader) {
         let promise = new Promise((resolve, reject) => {
-            let userPass = this.auth.split(':');
-            let addr = `${this.protocol}://${this.ip}:${this.port}/local/camoverlay/ws`;
-            let options = {
+            const userPass = this.auth.split(':');
+            const protocol = this.tls ? 'wss' : 'ws';
+            const addr = `${protocol}://${this.ip}:${this.port}/local/camoverlay/ws`;
+            const options = {
                 auth: this.auth,
+                rejectUnauthorized: !this.tlsInsecure,
                 headers: {},
             };
             if (digestHeader != undefined) {
@@ -241,55 +240,33 @@ class CamOverlayAPI extends EventEmitter {
     }
     promiseCGUpdate(action, params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const path = encodeURI(`/local/camoverlay/api/customGraphics.cgi?action=${action}&service_id=${this.serviceID}${params}`);
-            const options = {
-                method: 'POST',
-                host: this.ip,
-                port: this.port,
-                path: path,
-                auth: this.auth,
-            };
+            const options = this.getBaseVapixConnectionParams();
+            options.method = 'POST';
+            options.path = encodeURI(`/local/camoverlay/api/customGraphics.cgi?action=${action}&service_id=${this.serviceID}${params}`);
             yield (0, HTTPRequest_1.httpRequest)(options, '');
         });
     }
     updateInfoticker(text) {
         return __awaiter(this, void 0, void 0, function* () {
-            const path = `/local/camoverlay/api/infoticker.cgi?service_id=${this.serviceID}&text=${text}`;
-            const options = {
-                method: 'GET',
-                host: this.ip,
-                port: this.port,
-                path: path,
-                auth: this.auth,
-            };
+            const options = this.getBaseVapixConnectionParams();
+            options.method = 'GET';
+            options.path = `/local/camoverlay/api/infoticker.cgi?service_id=${this.serviceID}&text=${text}`;
             yield (0, HTTPRequest_1.httpRequest)(options, '');
         });
     }
     setEnabled(enabled) {
         return __awaiter(this, void 0, void 0, function* () {
-            if ((yield this.isEnabled()) !== enabled) {
-                const value = enabled ? 1 : 0;
-                const path = encodeURI(`/local/camoverlay/api/enabled.cgi?id_${this.serviceID}=${value}`);
-                const options = {
-                    method: 'POST',
-                    host: this.ip,
-                    port: this.port,
-                    path: path,
-                    auth: this.auth,
-                };
-                yield (0, HTTPRequest_1.httpRequest)(options, '');
-            }
+            const options = this.getBaseVapixConnectionParams();
+            options.method = 'POST';
+            options.path = encodeURI(`/local/camoverlay/api/enabled.cgi?id_${this.serviceID}=${enabled ? 1 : 0}`);
+            yield (0, HTTPRequest_1.httpRequest)(options, '');
         });
     }
     isEnabled() {
         return __awaiter(this, void 0, void 0, function* () {
-            const options = {
-                method: 'GET',
-                host: this.ip,
-                port: this.port,
-                path: '/local/camoverlay/api/services.cgi?action=get',
-                auth: this.auth,
-            };
+            const options = this.getBaseVapixConnectionParams();
+            options.method = 'GET';
+            options.path = '/local/camoverlay/api/services.cgi?action=get';
             const response = (yield (0, HTTPRequest_1.httpRequest)(options, ''));
             const data = JSON.parse(response);
             for (let service of data.services) {
@@ -300,5 +277,14 @@ class CamOverlayAPI extends EventEmitter {
             throw new Error('Service not found.');
         });
     }
+    getBaseVapixConnectionParams() {
+        return {
+            protocol: this.tls ? 'https:' : 'http:',
+            host: this.ip,
+            port: this.port,
+            auth: this.auth,
+            rejectUnauthorized: !this.tlsInsecure,
+        };
+    }
 }
 exports.CamOverlayAPI = CamOverlayAPI;

package/CamStreamerAPI.d.ts

@@ -1,11 +1,14 @@
 export declare type CamStreamerAPIOptions = {
     protocol?: string;
+    tls?: boolean;
+    tlsInsecure?: boolean;
     ip?: string;
     port?: number;
     auth?: string;
 };
 export declare class CamStreamerAPI {
-    private protocol;
+    private tls;
+    private tlsInsecure;
     private ip;
     private port;
     private auth;

package/CamStreamerAPI.js

@@ -13,11 +13,15 @@ exports.CamStreamerAPI = void 0;
 const HTTPRequest_1 = require("./HTTPRequest");
 class CamStreamerAPI {
     constructor(options) {
-        var _a, _b, _c, _d;
-        this.protocol = (_a = options === null || options === void 0 ? void 0 : options.protocol) !== null && _a !== void 0 ? _a : 'http';
-        this.ip = (_b = options === null || options === void 0 ? void 0 : options.ip) !== null && _b !== void 0 ? _b : '127.0.0.1';
-        this.port = ((_c = options === null || options === void 0 ? void 0 : options.port) !== null && _c !== void 0 ? _c : this.protocol == 'http') ? 80 : 443;
-        this.auth = (_d = options === null || options === void 0 ? void 0 : options.auth) !== null && _d !== void 0 ? _d : '';
+        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);
+        this.auth = (_e = options === null || options === void 0 ? void 0 : options.auth) !== null && _e !== void 0 ? _e : '';
     }
     getStreamList() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -52,10 +56,11 @@ class CamStreamerAPI {
     }
     getBaseConnectionParams() {
         return {
-            protocol: this.protocol + ':',
+            protocol: this.tls ? 'https:' : 'http:',
             host: this.ip,
             port: this.port,
             auth: this.auth,
+            rejectUnauthorized: !this.tlsInsecure,
         };
     }
 }

package/CamSwitcherAPI.d.ts

@@ -1,11 +1,15 @@
 /// <reference types="node" />
 import * as EventEmitter from 'events';
 export declare type CamSwitcherAPIOptions = {
+    tls?: boolean;
+    tlsInsecure?: boolean;
     ip?: string;
     port?: number;
     auth?: string;
 };
 export declare class CamSwitcherAPI extends EventEmitter {
+    private tls;
+    private tlsInsecure;
     private ip;
     private port;
     private auth;

package/CamSwitcherAPI.js

@@ -15,18 +15,23 @@ const EventEmitter = require("events");
 const HTTPRequest_1 = require("./HTTPRequest");
 class CamSwitcherAPI extends EventEmitter {
     constructor(options) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e;
         super();
-        this.ip = (_a = options === null || options === void 0 ? void 0 : options.ip) !== null && _a !== void 0 ? _a : '127.0.0.1';
-        this.port = (_b = options === null || options === void 0 ? void 0 : options.port) !== null && _b !== void 0 ? _b : 80;
-        this.auth = (_c = options === null || options === void 0 ? void 0 : options.auth) !== null && _c !== void 0 ? _c : '';
+        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.auth = (_e = options === null || options === void 0 ? void 0 : options.auth) !== null && _e !== void 0 ? _e : '';
         EventEmitter.call(this);
     }
     connect() {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 const token = yield this.get('/local/camswitcher/ws_authorization.cgi');
-                this.ws = new WebSocket(`ws://${this.ip}:${this.port}/local/camswitcher/events`, 'events');
+                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;
                 this.ws.on('open', () => {
                     this.ws.send(JSON.stringify({ authorization: token }));
@@ -109,10 +114,11 @@ class CamSwitcherAPI extends EventEmitter {
     }
     getBaseConnectionParams() {
         return {
-            protocol: 'http:',
+            protocol: this.tls ? 'https:' : 'http:',
             host: this.ip,
             port: this.port,
             auth: this.auth,
+            rejectUnauthorized: !this.tlsInsecure,
         };
     }
 }

package/CameraVapix.d.ts

@@ -4,6 +4,8 @@ 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;
@@ -46,7 +48,8 @@ export declare type GuardTour = {
     }[];
 };
 export declare class CameraVapix extends EventEmitter {
-    private protocol;
+    private tls;
+    private tlsInsecure;
     private ip;
     private port;
     private auth;

package/CameraVapix.js

@@ -19,14 +19,18 @@ const RtspClient_1 = require("./RtspClient");
 const HTTPRequest_1 = require("./HTTPRequest");
 class CameraVapix extends eventemitter2_1.EventEmitter2 {
     constructor(options) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         super();
         this.rtsp = null;
         this.ws = null;
-        this.protocol = (_a = options === null || options === void 0 ? void 0 : options.protocol) !== null && _a !== void 0 ? _a : 'http';
-        this.ip = (_b = options === null || options === void 0 ? void 0 : options.ip) !== null && _b !== void 0 ? _b : '127.0.0.1';
-        this.port = (_c = options === null || options === void 0 ? void 0 : options.port) !== null && _c !== void 0 ? _c : (this.protocol == 'http' ? 80 : 443);
-        this.auth = (_d = options === null || options === void 0 ? void 0 : options.auth) !== null && _d !== void 0 ? _d : '';
+        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);
+        this.auth = (_e = options === null || options === void 0 ? void 0 : options.auth) !== null && _e !== void 0 ? _e : '';
     }
     getParameterGroup(groupNames) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -318,10 +322,11 @@ class CameraVapix extends eventemitter2_1.EventEmitter2 {
     }
     getBaseVapixConnectionParams() {
         return {
-            protocol: this.protocol + ':',
+            protocol: this.tls ? 'https:' : 'http:',
             host: this.ip,
             port: this.port,
             auth: this.auth,
+            rejectUnauthorized: !this.tlsInsecure,
         };
     }
 }

package/HTTPRequest.d.ts

@@ -11,5 +11,6 @@ export declare type HttpRequestOptions = {
     headers?: {
         'Content-Type'?: string;
     };
+    rejectUnauthorized?: boolean;
 };
 export declare function httpRequest(options: HttpRequestOptions, postData?: string, noWaitForData?: boolean): Promise<string | http.IncomingMessage>;

package/HTTPRequest.js

@@ -49,7 +49,7 @@ function request(options, postData, digestHeader, noWaitForData) {
         var _a, _b;
         if (digestHeader != undefined) {
             if (options.auth == undefined) {
-                reject('No credentials found');
+                reject(new Error('No credentials found'));
             }
             const auth = options.auth.split(':');
             delete options.auth;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "camstreamerlib",
-  "version": "1.7.5",
+  "version": "1.8.0",
   "description": "Helper library for CamStreamer ACAP applications.",
   "prettier": "@camstreamer/prettier-config",
   "dependencies": {