camstreamerlib 1.7.3 → 1.7.5

package/CamOverlayAPI.d.ts

@@ -15,6 +15,27 @@ export declare type Field = {
     text: string;
     color?: string;
 };
+export declare type Message = {
+    command: string;
+    params: any[];
+};
+export declare type CairoResponse = {
+    message: string;
+    call_id: number;
+};
+export declare type CairoCreateResponse = {
+    var: string;
+    call_id: number;
+};
+export declare type UploadImageResponse = {
+    var: string;
+    width: number;
+    height: number;
+    call_id: number;
+};
+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 = {
     id: number;
     enabled: number;
@@ -42,14 +63,14 @@ export declare class CamOverlayAPI extends EventEmitter {
     createService(): Promise<number>;
     updateServices(servicesJson: ServiceJson): Promise<void>;
     openWebsocket(digestHeader?: string): Promise<void>;
-    cairo(command: string, ...params: any[]): Promise<unknown>;
-    writeText(...params: any[]): Promise<unknown>;
-    uploadImageData(imgBuffer: Buffer): Promise<unknown>;
-    uploadFontData(fontBuffer: Buffer): Promise<unknown>;
-    showCairoImage(cairoImage: any, posX: number, posY: number): Promise<unknown>;
-    removeImage(): Promise<unknown>;
-    showCairoImageAbsolute(cairoImage: any, posX: number, posY: number, width: number, height: number): Promise<unknown>;
-    sendMessage(msgJson: any): Promise<unknown>;
+    cairo(command: string, ...params: any[]): Promise<CairoResponse | CairoCreateResponse>;
+    writeText(...params: WriteTextParams): Promise<CairoResponse>;
+    uploadImageData(imgBuffer: Buffer): Promise<UploadImageResponse>;
+    uploadFontData(fontBuffer: Buffer): Promise<CairoCreateResponse>;
+    showCairoImage(cairoImage: string, posX: number, posY: number): Promise<CairoResponse>;
+    showCairoImageAbsolute(cairoImage: string, posX: number, posY: number, width: number, height: number): Promise<CairoResponse>;
+    removeImage(): Promise<CairoResponse>;
+    sendMessage(msgJson: Message): Promise<CairoResponse | CairoCreateResponse | UploadImageResponse>;
     reportMsg(msg: string): void;
     reportErr(err: Error): void;
     reportClose(): void;

package/CamOverlayAPI.js

@@ -32,18 +32,15 @@ class CamOverlayAPI extends EventEmitter {
     }
     connect() {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.serviceID != -1) {
+            try {
+                if (this.serviceID == -1) {
+                    this.serviceID = yield this.createService();
+                }
                 yield this.openWebsocket();
+                this.emit('open');
             }
-            else {
-                try {
-                    let id = yield this.createService();
-                    this.serviceID = id;
-                    yield this.openWebsocket();
-                }
-                catch (err) {
-                    this.reportErr(err);
-                }
+            catch (err) {
+                this.reportErr(err);
             }
         });
     }
@@ -78,18 +75,13 @@ class CamOverlayAPI extends EventEmitter {
                 }
             }
             if (service != null) {
-                if (service.enabled == 1) {
-                    if (service.camera == undefined || service.camera != this.camera) {
-                        service.camera = this.camera;
-                        yield this.updateServices(servicesJson);
-                        return service.id;
-                    }
-                    else {
-                        return service.id;
-                    }
+                if (service.camera == undefined || service.camera != this.camera) {
+                    service.camera = this.camera;
+                    yield this.updateServices(servicesJson);
+                    return service.id;
                 }
                 else {
-                    throw new Error('CamOverlay service is not enabled');
+                    return service.id;
                 }
             }
             else {
@@ -174,16 +166,22 @@ class CamOverlayAPI extends EventEmitter {
         return this.sendMessage({ command: 'write_text', params: params });
     }
     uploadImageData(imgBuffer) {
-        return this.sendMessage({ command: 'upload_image_data', params: [imgBuffer.toString('base64')] });
+        return this.sendMessage({
+            command: 'upload_image_data',
+            params: [imgBuffer.toString('base64')],
+        });
     }
     uploadFontData(fontBuffer) {
-        return this.sendMessage({ command: 'upload_font_data', params: [fontBuffer.toString('base64')] });
+        return this.sendMessage({
+            command: 'upload_font_data',
+            params: [fontBuffer.toString('base64')],
+        });
     }
     showCairoImage(cairoImage, posX, posY) {
-        return this.sendMessage({ command: 'show_cairo_image', params: [this.serviceID, cairoImage, posX, posY] });
-    }
-    removeImage() {
-        return this.sendMessage({ command: 'remove_image', params: [this.serviceID] });
+        return this.sendMessage({
+            command: 'show_cairo_image',
+            params: [this.serviceID, cairoImage, posX, posY],
+        });
     }
     showCairoImageAbsolute(cairoImage, posX, posY, width, height) {
         return this.sendMessage({
@@ -191,8 +189,11 @@ class CamOverlayAPI extends EventEmitter {
             params: [this.serviceID, cairoImage, -1.0 + (2.0 / width) * posX, -1.0 + (2.0 / height) * posY],
         });
     }
+    removeImage() {
+        return this.sendMessage({ command: 'remove_image', params: [this.serviceID] });
+    }
     sendMessage(msgJson) {
-        let promise = new Promise((resolve, reject) => {
+        return new Promise((resolve, reject) => {
             try {
                 this.sendMessages[this.callId] = { resolve, reject };
                 msgJson['call_id'] = this.callId++;
@@ -202,7 +203,6 @@ class CamOverlayAPI extends EventEmitter {
                 this.reportErr(new Error(`Send message error: ${err}`));
             }
         });
-        return promise;
     }
     reportMsg(msg) {
         this.emit('msg', msg);
@@ -211,6 +211,7 @@ class CamOverlayAPI extends EventEmitter {
         var _a;
         (_a = this.ws) === null || _a === void 0 ? void 0 : _a.terminate();
         this.emit('error', err);
+        this.emit('close');
     }
     reportClose() {
         this.emit('close');
@@ -266,16 +267,18 @@ class CamOverlayAPI extends EventEmitter {
     }
     setEnabled(enabled) {
         return __awaiter(this, void 0, void 0, function* () {
-            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, '');
+            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, '');
+            }
         });
     }
     isEnabled() {

package/CameraVapix.js

@@ -23,7 +23,7 @@ class CameraVapix extends eventemitter2_1.EventEmitter2 {
         super();
         this.rtsp = null;
         this.ws = null;
-        this.protocol = (_a = options === null || options === void 0 ? void 0 : options.protocol) !== null && _a !== void 0 ? _a : 'html';
+        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 : '';

package/HTTPRequest.d.ts

@@ -6,7 +6,7 @@ export declare type HttpRequestOptions = {
     host: string;
     port: number;
     path?: string;
-    auth: string;
+    auth?: string;
     timeout?: number;
     headers?: {
         'Content-Type'?: string;

package/package.json

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