camstreamerlib 2.0.5 → 2.0.6

package/CamOverlayDrawingAPI.js

@@ -40,7 +40,6 @@ class CamOverlayDrawingAPI extends EventEmitter {
                 this.emit('open');
             }
             catch (err) {
-                this.reportError(err);
             }
         });
     }
@@ -173,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.5",
+  "version": "2.0.6",
   "description": "Helper library for CamStreamer ACAP applications.",
   "prettier": "@camstreamer/prettier-config",
   "dependencies": {