camstreamerlib 1.8.0 → 1.8.1

package/CamOverlayAPI.d.ts

@@ -10,7 +10,7 @@ export declare type CamOverlayOptions = {
     auth?: string;
     serviceName?: string;
     serviceID?: number;
-    camera?: number;
+    camera?: number | number[];
 };
 export declare type Field = {
     field_name: string;
@@ -44,7 +44,7 @@ export declare type Service = {
     schedule: string;
     name: string;
     identifier: string;
-    camera: number;
+    cameraList: number[];
 };
 export declare type ServiceList = {
     services: Service[];
@@ -57,7 +57,7 @@ export declare class CamOverlayAPI extends EventEmitter {
     private auth;
     private serviceName;
     private serviceID;
-    private camera;
+    private cameraList;
     private callId;
     private sendMessages;
     private ws;
@@ -86,4 +86,5 @@ export declare class CamOverlayAPI extends EventEmitter {
     setEnabled(enabled: boolean): Promise<void>;
     isEnabled(): Promise<boolean>;
     private getBaseVapixConnectionParams;
+    private compareCameraList;
 }

package/CamOverlayAPI.js

@@ -16,7 +16,7 @@ const Digest_1 = require("./Digest");
 const HTTPRequest_1 = require("./HTTPRequest");
 class CamOverlayAPI extends EventEmitter {
     constructor(options) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d, _e, _f, _g;
         super();
         this.ws = null;
         this.tls = (_a = options === null || options === void 0 ? void 0 : options.tls) !== null && _a !== void 0 ? _a : false;
@@ -25,11 +25,17 @@ class CamOverlayAPI extends EventEmitter {
         }
         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.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.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);
@@ -37,7 +43,7 @@ class CamOverlayAPI extends EventEmitter {
     connect() {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                if (this.serviceID == -1) {
+                if (this.serviceID === -1) {
                     this.serviceID = yield this.createService();
                 }
                 yield this.openWebsocket();
@@ -70,14 +76,14 @@ class CamOverlayAPI extends EventEmitter {
                 if (s.id > maxID) {
                     maxID = s.id;
                 }
-                if (s.identifier == this.serviceName && s.name == 'scripter') {
+                if (s.identifier === this.serviceName && s.name === 'scripter') {
                     service = s;
                     break;
                 }
             }
-            if (service != null) {
-                if (service.camera == undefined || service.camera != this.camera) {
-                    service.camera = this.camera;
+            if (service !== null) {
+                if (service.cameraList === undefined || !this.compareCameraList(service.cameraList)) {
+                    service.cameraList = this.cameraList;
                     yield this.updateServices(servicesJson);
                     return service.id;
                 }
@@ -93,7 +99,7 @@ class CamOverlayAPI extends EventEmitter {
                     schedule: '',
                     name: 'scripter',
                     identifier: this.serviceName,
-                    camera: this.camera,
+                    cameraList: this.cameraList,
                 };
                 servicesJson.services.push(service);
                 yield this.updateServices(servicesJson);
@@ -119,7 +125,7 @@ class CamOverlayAPI extends EventEmitter {
                 rejectUnauthorized: !this.tlsInsecure,
                 headers: {},
             };
-            if (digestHeader != undefined) {
+            if (digestHeader !== undefined) {
                 options.headers['Authorization'] = Digest_1.Digest.getAuthHeader(userPass[0], userPass[1], 'GET', '/local/camoverlay/ws', digestHeader);
             }
             this.ws = new WebSocket(addr, 'cairo-api', options);
@@ -142,7 +148,7 @@ class CamOverlayAPI extends EventEmitter {
                 }
             });
             this.ws.on('unexpected-response', (req, res) => __awaiter(this, void 0, void 0, function* () {
-                if (res.statusCode == 401 && res.headers['www-authenticate'] != undefined)
+                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);
@@ -220,14 +226,14 @@ class CamOverlayAPI extends EventEmitter {
         for (let field of fields) {
             const name = field.field_name;
             field_specs += `&${name}=${field.text}`;
-            if (field.color != undefined) {
+            if (field.color !== undefined) {
                 field_specs += `&${name}_color=${field.color}`;
             }
         }
         return this.promiseCGUpdate('update_text', field_specs);
     }
     formCoordinates(coordinates, x, y) {
-        return coordinates != '' ? `&coord_system=${coordinates}&pos_x=${x}&pos_y=${y}` : '';
+        return coordinates !== '' ? `&coord_system=${coordinates}&pos_x=${x}&pos_y=${y}` : '';
     }
     updateCGImage(path, coordinates = '', x = 0, y = 0) {
         const coord = this.formCoordinates(coordinates, x, y);
@@ -270,8 +276,8 @@ class CamOverlayAPI extends EventEmitter {
             const response = (yield (0, HTTPRequest_1.httpRequest)(options, ''));
             const data = JSON.parse(response);
             for (let service of data.services) {
-                if (service.id == this.serviceID) {
-                    return service.enabled == 1;
+                if (service.id === this.serviceID) {
+                    return service.enabled === 1;
                 }
             }
             throw new Error('Service not found.');
@@ -286,5 +292,9 @@ class CamOverlayAPI extends EventEmitter {
             rejectUnauthorized: !this.tlsInsecure,
         };
     }
+    compareCameraList(cameraList) {
+        return (this.cameraList.length === cameraList.length &&
+            this.cameraList.every((element, index) => element === cameraList[index]));
+    }
 }
 exports.CamOverlayAPI = CamOverlayAPI;

package/README.md

@@ -197,7 +197,7 @@ Module for easy control of CamOverlay drawing API. For more details on supported
 
 ### methods
 #### CameraVapix(options)
-Options parameter contains access to the camera, service name, service ID and camera. If service ID is not specified, service is automatically created/selected based on serviceName. Specify video channel using parameter camera (in which View Area overlay will be shown). If omitted the default value camera=0 is used.
+Options parameter contains access to the camera, service name, service ID and camera. If service ID is not specified, service is automatically created/selected based on serviceName. Specify video channel using parameter camera (in which View Area overlay will be shown). If you need to specify multiple video channels, you can use an array: `camera=[0,1]`. If omitted the default value `camera=0` is used.
 ```javascript
 options = {
   'ip': '127.0.0.1',

package/package.json

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