camstreamerlib 2.0.0 → 2.0.2

package/CameraVapix.js

@@ -237,7 +237,7 @@ class CameraVapix extends eventemitter2_1.EventEmitter2 {
         }
     }
     isReservedEventName(eventName) {
-        return eventName == 'eventsConnect' || eventName == 'eventsDisconnect' || eventName == 'websocketDisconnect';
+        return eventName == 'eventsConnect' || eventName == 'eventsDisconnect' || eventName == 'eventsClose';
     }
     getBaseVapixConnectionParams() {
         return {

package/CreatePackage.js

@@ -3,10 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const AdmZip = require("adm-zip");
 const Path = require("path");
 const fs = require("fs");
+const child_process_1 = require("child_process");
 function isDirectory(path) {
     const stat = fs.statSync(path);
     return stat.isDirectory();
 }
+const productionModulesFolder = 'production_modules';
 function getPackageVersion(folder) {
     try {
         const manifest = fs.readFileSync(Path.join(folder, 'manifest.json'));
@@ -25,7 +27,7 @@ function createZipArchive(zip, folder, options) {
         const isDir = isDirectory(path);
         if (file[0] === '.' ||
             zipFileRegex.test(file) ||
-            (file === 'node_modules' && !options.includeNodeModules) ||
+            file === 'node_modules' ||
             (file === 'src' && options.typeScriptPackage) ||
             options.excludedFileNames.includes(file)) {
             continue;
@@ -33,6 +35,9 @@ function createZipArchive(zip, folder, options) {
         else if (file === 'dist' && options.typeScriptPackage) {
             zip.addLocalFolder(path);
         }
+        else if (file === productionModulesFolder && options.includeNodeModules) {
+            zip.addLocalFolder(Path.join(productionModulesFolder, 'node_modules'), 'node_modules');
+        }
         else if (isDir) {
             zip.addLocalFolder(path, file);
         }
@@ -41,6 +46,16 @@ function createZipArchive(zip, folder, options) {
         }
     }
 }
+function installDependencies() {
+    if (!fs.existsSync(productionModulesFolder)) {
+        fs.mkdirSync(productionModulesFolder, {});
+    }
+    fs.cpSync('package.json', Path.join(productionModulesFolder, 'package.json'));
+    fs.cpSync('package-lock.json', Path.join(productionModulesFolder, 'package-lock.json'));
+    (0, child_process_1.execSync)(`npm ci --omit=dev`, {
+        cwd: Path.join(process.cwd(), productionModulesFolder),
+    });
+}
 function main(args) {
     const options = {
         includeNodeModules: false,
@@ -55,6 +70,9 @@ function main(args) {
             options.excludedFileNames = arg.substring(arg.indexOf('=') + 1).split(',');
         }
     }
+    if (options.includeNodeModules) {
+        installDependencies();
+    }
     if (fs.existsSync('dist')) {
         options.typeScriptPackage = true;
     }

package/WsClient.js

@@ -64,6 +64,8 @@ class WsClient extends EventEmitter {
         }
         this.ws.on('unexpected-response', (req, res) => __awaiter(this, void 0, void 0, function* () {
             if (res.statusCode === 401 && res.headers['www-authenticate'] !== undefined) {
+                this.ws.removeAllListeners();
+                clearInterval(this.pingTimer);
                 this.open(res.headers['www-authenticate']);
             }
             else {

package/package.json

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