camstreamerlib 1.8.5 → 1.8.7

package/CamOverlayAPI.js

@@ -135,10 +135,21 @@ class CamOverlayAPI extends EventEmitter {
             }
             this.ws = new WebSocket(addr, 'cairo-api', options);
             this.ws.binaryType = 'arraybuffer';
+            this.ws.isAlive = true;
+            const pingTimer = setInterval(() => {
+                if (this.ws.readyState !== this.ws.OPEN || this.ws.isAlive === false) {
+                    return this.ws.terminate();
+                }
+                this.ws.isAlive = false;
+                this.ws.ping();
+            }, 30000);
             this.ws.on('open', () => {
                 this.reportMsg('Websocket opened');
                 resolve();
             });
+            this.ws.on('pong', () => {
+                this.ws.isAlive = true;
+            });
             this.ws.on('message', (data) => {
                 let dataJSON = JSON.parse(data);
                 if (dataJSON.hasOwnProperty('call_id') && dataJSON['call_id'] in this.sendMessages) {
@@ -169,6 +180,7 @@ class CamOverlayAPI extends EventEmitter {
                 reject(error);
             });
             this.ws.on('close', () => {
+                clearInterval(pingTimer);
                 this.reportClose();
             });
         });

package/CreatePackage.js

@@ -18,16 +18,18 @@ function getPackageVersion(folder) {
     }
 }
 function createZipArchive(zip, folder, options) {
+    const zipFileRegex = new RegExp(`${Path.basename(folder)}(_[0-9]){3}\\.zip`);
     const files = fs.readdirSync(folder);
     for (let file of files) {
         const path = Path.join(folder, file);
         const isDir = isDirectory(path);
-        if (file[0] == '.' ||
-            (file == 'node_modules' && !options.includeNodeModules) ||
-            (file == 'src' && options.typeScriptPackage)) {
+        if (file[0] === '.' ||
+            zipFileRegex.test(file) ||
+            (file === 'node_modules' && !options.includeNodeModules) ||
+            (file === 'src' && options.typeScriptPackage)) {
             continue;
         }
-        else if (file == 'dist' && options.typeScriptPackage) {
+        else if (file === 'dist' && options.typeScriptPackage) {
             zip.addLocalFolder(path);
         }
         else if (isDir) {
@@ -44,7 +46,7 @@ function main(args) {
         typeScriptPackage: false,
     };
     for (let arg of args) {
-        if (arg == '-i' || arg == '-includeNodeModules') {
+        if (arg === '-i' || arg === '-includeNodeModules') {
             options.includeNodeModules = true;
         }
     }

package/HTTPRequest.js

@@ -14,12 +14,13 @@ const http = require("http");
 const https = require("https");
 const Digest_1 = require("./Digest");
 function httpRequest(options, postData, noWaitForData = false) {
-    var _a, _b;
-    var _c;
+    var _a, _b, _c;
+    var _d;
     return __awaiter(this, void 0, void 0, function* () {
+        options.timeout = (_a = options.timeout) !== null && _a !== void 0 ? _a : 10000;
         if (postData !== undefined) {
-            (_a = options.headers) !== null && _a !== void 0 ? _a : (options.headers = {});
-            (_b = (_c = options.headers)['Content-Type']) !== null && _b !== void 0 ? _b : (_c['Content-Type'] = 'application/x-www-form-urlencoded');
+            (_b = options.headers) !== null && _b !== void 0 ? _b : (options.headers = {});
+            (_c = (_d = options.headers)['Content-Type']) !== null && _c !== void 0 ? _c : (_d['Content-Type'] = 'application/x-www-form-urlencoded');
             options.headers['Content-Length'] = Buffer.byteLength(postData);
         }
         let response = yield request(options, postData, undefined, noWaitForData);
@@ -76,6 +77,9 @@ function request(options, postData, digestHeader, noWaitForData) {
             .on('error', (err) => {
             reject(err);
         });
+        req.on('timeout', () => {
+            req.destroy(new Error('Request timeout'));
+        });
         if (postData != undefined) {
             req.write(postData);
         }

package/package.json

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