camstreamerlib 1.8.1 → 1.8.2

package/CamOverlayAPI.d.ts

@@ -49,6 +49,10 @@ export declare type Service = {
 export declare type ServiceList = {
     services: Service[];
 };
+export declare enum ImageType {
+    PNG = 0,
+    JPEG = 1
+}
 export declare class CamOverlayAPI extends EventEmitter {
     private tls;
     private tlsInsecure;
@@ -73,15 +77,17 @@ export declare class CamOverlayAPI extends EventEmitter {
     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;
+    private sendMessage;
+    private sendBinaryMessage;
+    private reportMsg;
+    private reportErr;
+    private reportClose;
     updateCGText(fields: Field[]): Promise<void>;
     private formCoordinates;
     updateCGImage(path: string, coordinates?: string, x?: number, y?: number): Promise<void>;
+    updateCGImageFromData(imageType: ImageType, imageData: Buffer, coordinates?: string, x?: number, y?: number): Promise<void>;
     updateCGImagePos(coordinates?: string, x?: number, y?: number): Promise<void>;
-    promiseCGUpdate(action: string, params: string): Promise<void>;
+    promiseCGUpdate(action: string, params: string, contentType?: string, data?: Buffer): Promise<void>;
     updateInfoticker(text: string): Promise<void>;
     setEnabled(enabled: boolean): Promise<void>;
     isEnabled(): Promise<boolean>;

package/CamOverlayAPI.js

@@ -9,11 +9,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CamOverlayAPI = void 0;
+exports.CamOverlayAPI = exports.ImageType = void 0;
 const WebSocket = require("ws");
 const EventEmitter = require("events");
 const Digest_1 = require("./Digest");
 const HTTPRequest_1 = require("./HTTPRequest");
+var ImageType;
+(function (ImageType) {
+    ImageType[ImageType["PNG"] = 0] = "PNG";
+    ImageType[ImageType["JPEG"] = 1] = "JPEG";
+})(ImageType = exports.ImageType || (exports.ImageType = {}));
 class CamOverlayAPI extends EventEmitter {
     constructor(options) {
         var _a, _b, _c, _d, _e, _f, _g;
@@ -129,6 +134,7 @@ class CamOverlayAPI extends EventEmitter {
                 options.headers['Authorization'] = Digest_1.Digest.getAuthHeader(userPass[0], userPass[1], 'GET', '/local/camoverlay/ws', digestHeader);
             }
             this.ws = new WebSocket(addr, 'cairo-api', options);
+            this.ws.binaryType = 'arraybuffer';
             this.ws.on('open', () => {
                 this.reportMsg('Websocket opened');
                 resolve();
@@ -171,16 +177,16 @@ class CamOverlayAPI extends EventEmitter {
         return this.sendMessage({ command: 'write_text', params: params });
     }
     uploadImageData(imgBuffer) {
-        return this.sendMessage({
+        return this.sendBinaryMessage({
             command: 'upload_image_data',
-            params: [imgBuffer.toString('base64')],
-        });
+            params: [],
+        }, imgBuffer);
     }
     uploadFontData(fontBuffer) {
-        return this.sendMessage({
+        return this.sendBinaryMessage({
             command: 'upload_font_data',
             params: [fontBuffer.toString('base64')],
-        });
+        }, fontBuffer);
     }
     showCairoImage(cairoImage, posX, posY) {
         return this.sendMessage({
@@ -209,6 +215,24 @@ class CamOverlayAPI extends EventEmitter {
             }
         });
     }
+    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.reportErr(new Error(`Send binary message error: ${err}`));
+            }
+        });
+    }
     reportMsg(msg) {
         this.emit('msg', msg);
     }
@@ -219,6 +243,10 @@ class CamOverlayAPI extends EventEmitter {
         this.emit('close');
     }
     reportClose() {
+        for (const callId in this.sendMessages) {
+            this.sendMessages[callId].reject(new Error('Connection lost'));
+        }
+        this.sendMessages = {};
         this.emit('close');
     }
     updateCGText(fields) {
@@ -240,16 +268,24 @@ class CamOverlayAPI extends EventEmitter {
         const update = `&image=${path}`;
         return this.promiseCGUpdate('update_image', update + coord);
     }
+    updateCGImageFromData(imageType, imageData, coordinates = '', x = 0, y = 0) {
+        const coord = this.formCoordinates(coordinates, x, y);
+        const contentType = imageType === ImageType.PNG ? 'image/png' : 'image/jpeg';
+        return this.promiseCGUpdate('update_image', coord, contentType, imageData);
+    }
     updateCGImagePos(coordinates = '', x = 0, y = 0) {
         const coord = this.formCoordinates(coordinates, x, y);
         return this.promiseCGUpdate('update_image', coord);
     }
-    promiseCGUpdate(action, params) {
+    promiseCGUpdate(action, params, contentType, data) {
         return __awaiter(this, void 0, void 0, function* () {
             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, '');
+            if (contentType && data) {
+                options.headers = { 'Content-Type': contentType };
+            }
+            yield (0, HTTPRequest_1.httpRequest)(options, data);
         });
     }
     updateInfoticker(text) {
@@ -257,7 +293,7 @@ class CamOverlayAPI extends EventEmitter {
             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, '');
+            yield (0, HTTPRequest_1.httpRequest)(options);
         });
     }
     setEnabled(enabled) {
@@ -265,7 +301,7 @@ class CamOverlayAPI extends EventEmitter {
             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, '');
+            yield (0, HTTPRequest_1.httpRequest)(options);
         });
     }
     isEnabled() {
@@ -273,7 +309,7 @@ class CamOverlayAPI extends EventEmitter {
             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 response = (yield (0, HTTPRequest_1.httpRequest)(options));
             const data = JSON.parse(response);
             for (let service of data.services) {
                 if (service.id === this.serviceID) {

package/HTTPRequest.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import * as http from 'http';
 export declare type HttpRequestOptions = {
     method?: string;
@@ -13,4 +14,4 @@ export declare type HttpRequestOptions = {
     };
     rejectUnauthorized?: boolean;
 };
-export declare function httpRequest(options: HttpRequestOptions, postData?: string, noWaitForData?: boolean): Promise<string | http.IncomingMessage>;
+export declare function httpRequest(options: HttpRequestOptions, postData?: Buffer | string, noWaitForData?: boolean): Promise<string | http.IncomingMessage>;

package/package.json

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