camstreamerlib 2.0.4 → 2.0.6

package/CamOverlayDrawingAPI.d.ts

@@ -48,9 +48,10 @@ export declare class CamOverlayDrawingAPI extends EventEmitter {
     private zIndex;
     private callId;
     private sendMessages;
-    private ws;
+    private ws?;
     constructor(options?: CamOverlayDrawingOptions);
     connect(): Promise<void>;
+    disconnect(): void;
     cairo(command: string, ...params: any[]): Promise<CairoResponse | CairoCreateResponse>;
     writeText(...params: WriteTextParams): Promise<CairoResponse>;
     uploadImageData(imgBuffer: Buffer): Promise<UploadImageResponse>;

package/CamOverlayDrawingAPI.js

@@ -16,7 +16,6 @@ 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';
@@ -41,10 +40,14 @@ class CamOverlayDrawingAPI extends EventEmitter {
                 this.emit('open');
             }
             catch (err) {
-                this.reportError(err);
             }
         });
     }
+    disconnect() {
+        if (this.ws !== undefined) {
+            this.ws.close();
+        }
+    }
     cairo(command, ...params) {
         return this.sendMessage({ command: command, params: params });
     }
@@ -123,6 +126,7 @@ class CamOverlayDrawingAPI extends EventEmitter {
                 reject(error);
             });
             this.ws.on('close', () => {
+                this.ws = undefined;
                 this.reportClose();
             });
             this.ws.open();
@@ -133,6 +137,9 @@ class CamOverlayDrawingAPI extends EventEmitter {
             try {
                 this.sendMessages[this.callId] = { resolve, reject };
                 msgJson['call_id'] = this.callId++;
+                if (this.ws === undefined) {
+                    throw new Error('No CamOverlay connection');
+                }
                 this.ws.send(JSON.stringify(msgJson));
             }
             catch (err) {
@@ -151,6 +158,9 @@ class CamOverlayDrawingAPI extends EventEmitter {
                 headerView.setInt8(0, 1);
                 headerView.setInt32(1, jsonBuffer.byteLength);
                 const msgBuffer = Buffer.concat([Buffer.from(header), jsonBuffer, data]);
+                if (this.ws === undefined) {
+                    throw new Error('No CamOverlay connection');
+                }
                 this.ws.send(msgBuffer);
             }
             catch (err) {
@@ -162,7 +172,9 @@ class CamOverlayDrawingAPI extends EventEmitter {
         this.emit('message', msg);
     }
     reportError(err) {
-        this.ws.close();
+        if (this.ws !== undefined) {
+            this.ws.close();
+        }
         this.emit('error', err);
     }
     reportClose() {

package/WsClient.js

@@ -69,14 +69,14 @@ class WsClient extends EventEmitter {
                 this.open(res.headers['www-authenticate']);
             }
             else {
-                const e = new Error('Error: status code: ' + res.statusCode + ', ' + res.data);
+                const e = new Error('Status code: ' + res.statusCode);
                 this.emit('error', e);
             }
         }));
         this.ws.on('open', () => this.emit('open'));
         this.ws.on('message', (data) => this.emit('message', data));
         this.ws.on('error', (error) => this.emit('error', error));
-        this.ws.on('close', () => this.emit('close'));
+        this.ws.on('close', () => this.handleCloseEvent());
     }
     send(data) {
         if (this.ws.readyState === this.ws.OPEN) {
@@ -86,13 +86,14 @@ class WsClient extends EventEmitter {
     close() {
         try {
             this.handleCloseEvent();
-            this.ws.close();
+            if (this.ws.readyState !== this.ws.CLOSING && this.ws.readyState !== this.ws.CLOSED) {
+                this.ws.close();
+            }
         }
         catch (err) {
-            this.emit('error', err);
         }
         setTimeout(() => {
-            if (this.ws.readyState == this.ws.OPEN || this.ws.readyState == this.ws.CLOSING) {
+            if (this.ws.readyState !== this.ws.CLOSED) {
                 this.ws.terminate();
             }
         }, 5000);

package/package.json

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