camstreamerlib 1.8.2 → 1.8.4

package/CamOverlayAPI.js

@@ -142,12 +142,16 @@ class CamOverlayAPI extends EventEmitter {
             this.ws.on('message', (data) => {
                 let dataJSON = JSON.parse(data);
                 if (dataJSON.hasOwnProperty('call_id') && dataJSON['call_id'] in this.sendMessages) {
-                    this.sendMessages[dataJSON['call_id']].resolve(dataJSON);
+                    if (dataJSON.hasOwnProperty('error')) {
+                        this.sendMessages[dataJSON['call_id']].reject(new Error(dataJSON.error));
+                    }
+                    else {
+                        this.sendMessages[dataJSON['call_id']].resolve(dataJSON);
+                    }
                     delete this.sendMessages[dataJSON['call_id']];
                 }
                 if (dataJSON.hasOwnProperty('error')) {
-                    let error = new Error(JSON.stringify(data));
-                    this.reportErr(error);
+                    this.reportErr(new Error(dataJSON.error));
                 }
                 else {
                     this.reportMsg(data);
@@ -240,7 +244,6 @@ class CamOverlayAPI extends EventEmitter {
         var _a;
         (_a = this.ws) === null || _a === void 0 ? void 0 : _a.terminate();
         this.emit('error', err);
-        this.emit('close');
     }
     reportClose() {
         for (const callId in this.sendMessages) {

package/CreatePackage.js

@@ -7,6 +7,16 @@ function isDirectory(path) {
     const stat = fs.statSync(path);
     return stat.isDirectory();
 }
+function getPackageVersion(folder) {
+    try {
+        const manifest = fs.readFileSync(Path.join(folder, 'manifest.json'));
+        const manifestParsed = JSON.parse(manifest.toString());
+        return manifestParsed.package_version.replace(/\./g, '_');
+    }
+    catch (err) {
+        console.error('Get package version:', err);
+    }
+}
 function createZipArchive(zip, folder, options) {
     const files = fs.readdirSync(folder);
     for (let file of files) {
@@ -29,8 +39,6 @@ function createZipArchive(zip, folder, options) {
     }
 }
 function main(args) {
-    const folder = Path.resolve('.');
-    const zipFile = Path.basename(folder) + '.zip';
     const options = {
         includeNodeModules: false,
         typeScriptPackage: false,
@@ -43,6 +51,9 @@ function main(args) {
     if (fs.existsSync('dist')) {
         options.typeScriptPackage = true;
     }
+    const folder = Path.resolve('.');
+    const packageVersion = getPackageVersion(folder);
+    const zipFile = `${Path.basename(folder)}_${packageVersion}.zip`;
     if (fs.existsSync(zipFile)) {
         try {
             fs.unlinkSync(zipFile);

package/HttpServer.js

@@ -35,8 +35,8 @@ class HttpServer extends EventEmitter {
                 '.pdf': 'application/pdf',
                 '.doc': 'application/msword',
             };
-            fs.access(pathname, (exist) => {
-                if (!exist) {
+            fs.access(pathname, fs.constants.R_OK, (err) => {
+                if (err) {
                     res.statusCode = 404;
                     res.end(`File ${pathname} not found!`);
                     this.emit('error', `File ${pathname} not found!`);

package/package.json

@@ -1,27 +1,27 @@
 {
   "name": "camstreamerlib",
-  "version": "1.8.2",
+  "version": "1.8.4",
   "description": "Helper library for CamStreamer ACAP applications.",
   "prettier": "@camstreamer/prettier-config",
   "dependencies": {
+    "adm-zip": "^0.5.9",
     "crypto": "^1.0.1",
     "eventemitter2": "^5.0.1",
     "prettify-xml": "^1.2.0",
     "ws": "^7.4.2",
-    "xml2js": "^0.4.19",
-    "adm-zip": "^0.5.9"
+    "xml2js": "^0.5.0"
   },
   "devDependencies": {
     "@camstreamer/prettier-config": "^2.0.4",
     "@types/jest": "^28.0.0",
     "@types/node": "^18.0.6",
-    "typescript": "^4.7.4",
-    "ts-jest": "^28.0.0",
-    "ts-node": "^10.7.0",
     "jest": "^28.1.3",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.7.1",
-    "rimraf": "^3.0.2"
+    "rimraf": "^3.0.2",
+    "ts-jest": "^28.0.0",
+    "ts-node": "^10.7.0",
+    "typescript": "^4.7.4"
   },
   "scripts": {
     "clean": "rimraf dist/*",
@@ -32,7 +32,10 @@
     "pretty:check": "prettier --check \"./src/*.{ts,tsx}\"",
     "test": "node --experimental-vm-modules node_modules/jest/bin/jest.js"
   },
-  "files": ["*.js", "*.ts"],
+  "files": [
+    "*.js",
+    "*.ts"
+  ],
   "repository": {
     "type": "git",
     "url": "git+https://github.com/CamStreamer/CamStreamerLib.git"