camstreamerlib 1.7.4 → 1.7.6

package/CamOverlayAPI.d.ts

@@ -15,28 +15,28 @@ export declare type Field = {
     text: string;
     color?: string;
 };
-declare type Message = {
+export declare type Message = {
     command: string;
     params: any[];
 };
-declare type CairoResponse = {
+export declare type CairoResponse = {
     message: string;
     call_id: number;
 };
-declare type CairoCreateResponse = {
+export declare type CairoCreateResponse = {
     var: string;
     call_id: number;
 };
-declare type UploadImageResponse = {
+export declare type UploadImageResponse = {
     var: string;
     width: number;
     height: number;
     call_id: number;
 };
-declare type Align = 'A_RIGHT' | 'A_LEFT' | 'A_CENTER';
-declare type TextFit = 'TFM_SCALE' | 'TFM_TRUNCATE' | 'TFM_OVERFLOW';
-declare type WriteTextParams = [string, string, number, number, number, number, Align, TextFit?];
-declare type Service = {
+export declare type Align = 'A_RIGHT' | 'A_LEFT' | 'A_CENTER';
+export declare type TextFit = 'TFM_SCALE' | 'TFM_TRUNCATE' | 'TFM_OVERFLOW';
+export declare type WriteTextParams = [string, string, number, number, number, number, Align, TextFit?];
+export declare type Service = {
     id: number;
     enabled: number;
     schedule: string;
@@ -44,7 +44,7 @@ declare type Service = {
     identifier: string;
     camera: number;
 };
-declare type ServiceJson = {
+export declare type ServiceList = {
     services: Service[];
 };
 export declare class CamOverlayAPI extends EventEmitter {
@@ -61,7 +61,7 @@ export declare class CamOverlayAPI extends EventEmitter {
     constructor(options?: CamOverlayOptions);
     connect(): Promise<void>;
     createService(): Promise<number>;
-    updateServices(servicesJson: ServiceJson): Promise<void>;
+    updateServices(servicesJson: ServiceList): Promise<void>;
     openWebsocket(digestHeader?: string): Promise<void>;
     cairo(command: string, ...params: any[]): Promise<CairoResponse | CairoCreateResponse>;
     writeText(...params: WriteTextParams): Promise<CairoResponse>;
@@ -83,4 +83,3 @@ export declare class CamOverlayAPI extends EventEmitter {
     setEnabled(enabled: boolean): Promise<void>;
     isEnabled(): Promise<boolean>;
 }
-export {};

package/CamOverlayAPI.js

@@ -32,18 +32,15 @@ class CamOverlayAPI extends EventEmitter {
     }
     connect() {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.serviceID != -1) {
+            try {
+                if (this.serviceID == -1) {
+                    this.serviceID = yield this.createService();
+                }
                 yield this.openWebsocket();
+                this.emit('open');
             }
-            else {
-                try {
-                    let id = yield this.createService();
-                    this.serviceID = id;
-                    yield this.openWebsocket();
-                }
-                catch (err) {
-                    this.reportErr(err);
-                }
+            catch (err) {
+                this.reportErr(err);
             }
         });
     }
@@ -214,6 +211,7 @@ 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() {
         this.emit('close');
@@ -269,18 +267,16 @@ class CamOverlayAPI extends EventEmitter {
     }
     setEnabled(enabled) {
         return __awaiter(this, void 0, void 0, function* () {
-            if ((yield this.isEnabled()) !== enabled) {
-                const value = enabled ? 1 : 0;
-                const path = encodeURI(`/local/camoverlay/api/enabled.cgi?id_${this.serviceID}=${value}`);
-                const options = {
-                    method: 'POST',
-                    host: this.ip,
-                    port: this.port,
-                    path: path,
-                    auth: this.auth,
-                };
-                yield (0, HTTPRequest_1.httpRequest)(options, '');
-            }
+            const value = enabled ? 1 : 0;
+            const path = encodeURI(`/local/camoverlay/api/enabled.cgi?id_${this.serviceID}=${value}`);
+            const options = {
+                method: 'POST',
+                host: this.ip,
+                port: this.port,
+                path: path,
+                auth: this.auth,
+            };
+            yield (0, HTTPRequest_1.httpRequest)(options, '');
         });
     }
     isEnabled() {

package/package.json

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