camstreamerlib 1.6.2 → 1.7.2

package/CamOverlayAPI.d.ts

@@ -2,13 +2,13 @@
 /// <reference types="node" />
 import * as EventEmitter from 'events';
 export declare type CamOverlayOptions = {
-    protocol: string;
-    ip: string;
-    port: number;
-    auth: string;
-    serviceName: string;
-    serviceID: number;
-    camera: number;
+    protocol?: string;
+    ip?: string;
+    port?: number;
+    auth?: string;
+    serviceName?: string;
+    serviceID?: number;
+    camera?: number;
 };
 export declare type Field = {
     field_name: string;

package/CamOverlayAPI.js

@@ -267,7 +267,7 @@ class CamOverlayAPI extends EventEmitter {
     setEnabled(enabled) {
         return __awaiter(this, void 0, void 0, function* () {
             const value = enabled ? 1 : 0;
-            const path = encodeURI(`/local/camoverlay/api/enabled.cgi?id${this.serviceID}=${value}`);
+            const path = encodeURI(`/local/camoverlay/api/enabled.cgi?id_${this.serviceID}=${value}`);
             const options = {
                 method: 'POST',
                 host: this.ip,

package/CamStreamerAPI.d.ts

@@ -1,8 +1,8 @@
 export declare type CamStreamerAPIOptions = {
-    protocol: string;
-    ip: string;
-    port: number;
-    auth: string;
+    protocol?: string;
+    ip?: string;
+    port?: number;
+    auth?: string;
 };
 export declare class CamStreamerAPI {
     private protocol;

package/CreatePackage.d.ts

@@ -0,0 +1 @@
+export {};

package/CreatePackage.js

@@ -0,0 +1,59 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs = require("fs");
+const Path = require("path");
+const AdmZip = require("adm-zip");
+function isDirectory(path) {
+    const stat = fs.statSync(path);
+    return stat.isDirectory();
+}
+function createZipArchive(zip, folder, options) {
+    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)) {
+            continue;
+        }
+        else if (file == 'dist' && options.typeScriptPackage) {
+            zip.addLocalFolder(path);
+        }
+        else if (isDir) {
+            zip.addLocalFolder(path, file);
+        }
+        else {
+            zip.addLocalFile(path);
+        }
+    }
+}
+function main(args) {
+    const folder = Path.resolve('.');
+    const zipFile = Path.basename(folder) + '.zip';
+    const options = {
+        includeNodeModules: false,
+        typeScriptPackage: false,
+    };
+    for (let arg of args) {
+        if (arg == '-i' || arg == '-includeNodeModules') {
+            options.includeNodeModules = true;
+        }
+    }
+    if (fs.existsSync('dist')) {
+        options.typeScriptPackage = true;
+    }
+    if (fs.existsSync(zipFile)) {
+        try {
+            fs.unlinkSync(zipFile);
+        }
+        catch (error) {
+            console.log('An error occured: ', error);
+            process.exit(1);
+        }
+    }
+    const zip = new AdmZip();
+    createZipArchive(zip, folder, options);
+    zip.writeZip(zipFile);
+}
+main(process.argv.slice(2));

package/README.md

@@ -334,3 +334,17 @@ np
 ```
 The utility will ask you for the prefered version raise and if you are lucky, everything will run just fine.
 Finally, edit GitHub release form.
+
+### Preparing a package to upload to CamScripter
+If you want to create your own package and upload it to CamScripter App, you can use the script CreatePackage. It creates a zip file which contains all required files and directories in your package folder. The script accepts source code written either in JavaScript or TypeScript if the package has the correct structure (more information in https://github.com/CamStreamer/CamScripterApp_examples/#readme). To include this script in your package add the following lines in the file package.json:
+```json
+"scripts": {
+    "create-package": "node node_modules/camstreamerlib/CreatePackage.js"
+  }
+```
+By default, the zipped package does not contain node_modules directory. If you want to include it (required when uploading to CamScripter App on Axis camera), add this:
+```json
+"scripts": {
+    "create-package": "node node_modules/camstreamerlib/CreatePackage.js -includeNodeModules"
+  }
+```

package/package.json

@@ -1,13 +1,12 @@
 {
   "name": "camstreamerlib",
-  "version": "1.6.2",
+  "version": "1.7.2",
   "description": "Helper library for CamStreamer ACAP applications.",
   "prettier": "@camstreamer/prettier-config",
   "dependencies": {
     "crypto": "^1.0.1",
     "eventemitter2": "^5.0.1",
     "prettify-xml": "^1.2.0",
-    "typescript": "^4.7.4",
     "ws": "^7.4.2",
     "xml2js": "^0.4.19"
   },
@@ -15,6 +14,8 @@
     "@camstreamer/prettier-config": "^2.0.4",
     "@types/jest": "^28.0.0",
     "@types/node": "^18.0.6",
+    "adm-zip": "^0.5.9",
+    "typescript": "^4.7.4",
     "ts-jest": "^28.0.0",
     "ts-node": "^10.7.0",
     "jest": "^28.1.3",