hoffmation-base 3.0.0-alpha.8 → 3.0.0-alpha.81

package/lib/server/ioBroker/connection.js

@@ -26,6 +26,7 @@ var ConnectionState;
 })(ConnectionState || (ConnectionState = {}));
 class IOBrokerConnection {
     constructor(connOptions = {}, connCallbacks = new models_1.ConnectionCallbacks(), objectsRequired = false) {
+        var _a;
         this._authInfo = new ioBrokerAuthInfo_1.IoBrokerAuthInfo();
         this._authRunning = false;
         this._cmdQueue = new Array();
@@ -78,7 +79,7 @@ class IOBrokerConnection {
         this._connCallbacks = connCallbacks;
         let connLink = connOptions.connLink;
         if (!connOptions.connLink && this._isExecutedInBrowser) {
-            connLink = window.localStorage.getItem('connLink');
+            connLink = (_a = window.localStorage.getItem('connLink')) !== null && _a !== void 0 ? _a : undefined;
         }
         // Connection data from "/_socket/info.js"
         if (!connLink && typeof socketUrl !== 'undefined')
@@ -158,7 +159,7 @@ class IOBrokerConnection {
             }, 50, this);
         });
         this._socket.on('reauthenticate', () => {
-            iobrokerConnectionLogging_1.iobrokerConnectionLogging.writeLog(iobrokerConnectionLogging_1.iobrokerConnectionLogLevel.Error, `Connection.ts: socket.on(reauthenticate)`);
+            iobrokerConnectionLogging_1.iobrokerConnectionLogging.writeLog(iobrokerConnectionLogging_1.iobrokerConnectionLogLevel.Error, 'Connection.ts: socket.on(reauthenticate)');
             if (this._connCallbacks.onConnChange) {
                 this._connCallbacks.onConnChange(false);
                 if (typeof app !== 'undefined') {
@@ -175,7 +176,7 @@ class IOBrokerConnection {
             this.reconnect(connOptions);
         });
         this._socket.on('disconnect', () => {
-            iobrokerConnectionLogging_1.iobrokerConnectionLogging.writeLog(iobrokerConnectionLogging_1.iobrokerConnectionLogLevel.Error, `Connection.ts: socket.on('disconnect')`);
+            iobrokerConnectionLogging_1.iobrokerConnectionLogging.writeLog(iobrokerConnectionLogging_1.iobrokerConnectionLogLevel.Error, "Connection.ts: socket.on('disconnect')");
             this._disconnectedSince = new Date();
             // called only once when connection lost (and it was here before)
             this._isConnected = false;
@@ -290,6 +291,7 @@ class IOBrokerConnection {
             }
             const err = reason;
             iobrokerConnectionLogging_1.iobrokerConnectionLogging.writeLog(iobrokerConnectionLogging_1.iobrokerConnectionLogLevel.Error, `Recieved socket error: ${err.message}\nStack:${err.stack}`);
+            // @ts-ignore
             const innerErr = reason.description;
             if (innerErr) {
                 iobrokerConnectionLogging_1.iobrokerConnectionLogging.writeLog(iobrokerConnectionLogging_1.iobrokerConnectionLogLevel.Error, `Inner socket error: ${innerErr.message}\nStack:${innerErr.stack}`);
@@ -298,91 +300,91 @@ class IOBrokerConnection {
     }
     /**
      * Getter isExecutedInBrowser
-     * @return {boolean }
+     * @returns
      */
     get isExecutedInBrowser() {
         return this._isExecutedInBrowser;
     }
     /**
      * Getter enums
-     * @return {unknown}
+     * @returns
      */
     get enums() {
         return this._enums;
     }
     /**
      * Setter enums
-     * @param {unknown} value
+     * @param value
      */
     set enums(value) {
         this._enums = value;
     }
     /**
      * Getter isAuthDone
-     * @return {boolean }
+     * @returns
      */
     get isAuthDone() {
         return this._isAuthDone;
     }
     /**
      * Getter namespace
-     * @return {string }
+     * @returns
      */
     get namespace() {
         return this._namespace;
     }
     /**
      * Setter namespace
-     * @param {string } value
+     * @param value
      */
     set namespace(value) {
         this._namespace = value;
     }
     /**
      * Getter objects
-     * @return {unknown}
+     * @returns
      */
     get objects() {
         return this._objects;
     }
     /**
      * Setter objects
-     * @param {unknown} value
+     * @param value
      */
     set objects(value) {
         this._objects = value;
     }
     /**
      * Getter type
-     * @return {string }
+     * @returns
      */
     get type() {
         return this._type;
     }
     /**
      * Setter type
-     * @param {string } value
+     * @param value
      */
     set type(value) {
         this._type = value;
     }
     /**
      * Getter timeout
-     * @return {number }
+     * @returns
      */
     get timeout() {
         return this._timeout;
     }
     /**
      * Setter timeout
-     * @param {number } value
+     * @param value
      */
     set timeout(value) {
         this._timeout = value;
     }
     /**
      * Getter user
-     * @return {unknown}
+     * @returns
      */
     get user() {
         return this._user;
@@ -390,7 +392,7 @@ class IOBrokerConnection {
     //#endregion
     /**
      * Setter user
-     * @param {unknown} value
+     * @param value
      */
     set user(value) {
         this._user = value;
@@ -401,7 +403,7 @@ class IOBrokerConnection {
         if (this._connectInterval !== undefined || (pConnOptions.mayReconnect && !pConnOptions.mayReconnect())) {
             return;
         }
-        iobrokerConnectionLogging_1.iobrokerConnectionLogging.writeLog(iobrokerConnectionLogging_1.iobrokerConnectionLogLevel.Trace, `Connection.ts: reconnect()`);
+        iobrokerConnectionLogging_1.iobrokerConnectionLogging.writeLog(iobrokerConnectionLogging_1.iobrokerConnectionLogLevel.Trace, 'Connection.ts: reconnect()');
         this._connectInterval = services_1.Utils.guardedInterval(() => {
             iobrokerConnectionLogging_1.iobrokerConnectionLogging.writeLog(iobrokerConnectionLogging_1.iobrokerConnectionLogLevel.Debug, 'Trying connect...');
             this._socket.connect();
@@ -478,7 +480,7 @@ class IOBrokerConnection {
             const regMatch = ext.toLowerCase().match(/\.[^.]+$/);
             ext = regMatch !== null && regMatch.length > 0 ? regMatch[0] : '';
         }
-        let _mimeType = '';
+        let _mimeType;
         if (ext === '.css') {
             _mimeType = 'text/css';
         }
@@ -588,7 +590,7 @@ class IOBrokerConnection {
     // @ts-ignore
     writeFile(filename, data, mode, callback, 
     // @ts-ignore
-    ...args) {
+    ..._args) {
         if (this._type === 'local') {
             // @ts-ignore
             storage.set(filename, JSON.stringify(data));
@@ -764,6 +766,7 @@ class IOBrokerConnection {
                     }
                     for (const row of res.rows) {
                         if (row.value !== null) {
+                            // @ts-ignore
                             data[row.id] = row.value;
                         }
                     }
@@ -781,6 +784,7 @@ class IOBrokerConnection {
                         }
                         for (const row of res.rows) {
                             if (row.value !== null) {
+                                // @ts-ignore
                                 data[row.id] = row.value;
                             }
                         }
@@ -792,6 +796,7 @@ class IOBrokerConnection {
                             }
                             for (const row of res.rows) {
                                 if (row.value !== null) {
+                                    // @ts-ignore
                                     data[row.id] = row.value;
                                 }
                             }
@@ -819,7 +824,7 @@ class IOBrokerConnection {
     // @ts-ignore
     getChildren(id, useCache, callback, 
     // @ts-ignore
-    ...args) {
+    ..._args) {
         if (this._checkConnection('getChildren', arguments) != ConnectionState.connected)
             return;
         if (!id)
@@ -849,6 +854,7 @@ class IOBrokerConnection {
             }
             for (const row of res.rows) {
                 if (row.value !== null) {
+                    // @ts-ignore
                     data[row.id] = row.value;
                 }
             }
@@ -859,6 +865,7 @@ class IOBrokerConnection {
                 }
                 for (const row of res.rows) {
                     if (row.value !== null) {
+                        // @ts-ignore
                         data[row.id] = row.value;
                     }
                 }
@@ -870,6 +877,7 @@ class IOBrokerConnection {
                     }
                     for (const row of res.rows) {
                         if (row.value !== null) {
+                            // @ts-ignore
                             data[row.id] = row.value;
                         }
                     }
@@ -960,7 +968,7 @@ class IOBrokerConnection {
         return new Date(0);
     }
     // @ts-ignore
-    addObject(objId, obj, callback) {
+    addObject(_objId, _obj, _callback) {
         if (!this._isConnected) {
             iobrokerConnectionLogging_1.iobrokerConnectionLogging.writeLog(iobrokerConnectionLogging_1.iobrokerConnectionLogLevel.Debug, 'No connection!');
             return;
@@ -1024,7 +1032,7 @@ class IOBrokerConnection {
     // FIXME finish implementation of this file
     getConfig(useCache, callback, 
     // @ts-ignore
-    ...args) {
+    ..._args) {
         if (this._checkConnection('getConfig', arguments) != ConnectionState.connected)
             return;
         if (typeof useCache === 'function') {
@@ -1112,7 +1120,7 @@ class IOBrokerConnection {
     }
     getHistory(id, options, callback, 
     // @ts-ignore
-    ...args) {
+    ..._args) {
         if (this._checkConnection('getHistory', arguments) != ConnectionState.connected)
             return;
         if (!options)
@@ -1247,18 +1255,18 @@ class IOBrokerConnection {
     }
     _queueCmdIfRequired(func, args) {
         if (this.isAuthDone) {
-            iobrokerConnectionLogging_1.iobrokerConnectionLogging.writeLog(iobrokerConnectionLogging_1.iobrokerConnectionLogLevel.DeepTrace, `_queueCmdIfRequired: Auth is already done`);
+            iobrokerConnectionLogging_1.iobrokerConnectionLogging.writeLog(iobrokerConnectionLogging_1.iobrokerConnectionLogLevel.DeepTrace, '_queueCmdIfRequired: Auth is already done');
             return false;
         }
-        iobrokerConnectionLogging_1.iobrokerConnectionLogging.writeLog(iobrokerConnectionLogging_1.iobrokerConnectionLogLevel.Trace, `_queueCmdIfRequired: Auth is not yet done`);
+        iobrokerConnectionLogging_1.iobrokerConnectionLogging.writeLog(iobrokerConnectionLogging_1.iobrokerConnectionLogLevel.Trace, '_queueCmdIfRequired: Auth is not yet done');
         // Queue command
         // @ts-ignore
         this._cmdQueue.push({ func: func, args: args });
         if (this._authRunning) {
-            iobrokerConnectionLogging_1.iobrokerConnectionLogging.writeLog(iobrokerConnectionLogging_1.iobrokerConnectionLogLevel.DeepTrace, `_queueCmdIfRequired: Authentication Process is already Running`);
+            iobrokerConnectionLogging_1.iobrokerConnectionLogging.writeLog(iobrokerConnectionLogging_1.iobrokerConnectionLogLevel.DeepTrace, '_queueCmdIfRequired: Authentication Process is already Running');
             return true;
         }
-        iobrokerConnectionLogging_1.iobrokerConnectionLogging.writeLog(iobrokerConnectionLogging_1.iobrokerConnectionLogLevel.Trace, `_queueCmdIfRequired: Starting Authentication Process`);
+        iobrokerConnectionLogging_1.iobrokerConnectionLogging.writeLog(iobrokerConnectionLogging_1.iobrokerConnectionLogLevel.Trace, '_queueCmdIfRequired: Starting Authentication Process');
         this._authRunning = true;
         // Try to read version
         // @ts-ignore
@@ -1309,6 +1317,7 @@ class IOBrokerConnection {
             callback(err);
         });
     }
+    /** @inheritDoc */
     dispose() {
         if (this._connectInterval) {
             clearInterval(this._connectInterval);

package/lib/server/ioBroker/ioBroker.main.d.ts

@@ -3,6 +3,9 @@ import { iRoomBase } from '../../models';
 import { IOBrokerConnection } from './connection';
 export declare class ioBrokerMain {
     private static readonly SplitKeys;
+    /**
+     * The connection to the ioBroker server
+     */
     static iOConnection: IOBrokerConnection | undefined;
     private static roomConstructors;
     private servConn;

package/lib/server/ioBroker/ioBroker.main.js

@@ -6,13 +6,14 @@ const models_1 = require("../../models");
 const connection_1 = require("./connection");
 class ioBrokerMain {
     constructor(pDeviceUpdater) {
+        var _a, _b;
         this.states = {};
         this.deviceUpdater = pDeviceUpdater;
         this.connectionCallbacks = new models_1.ConnectionCallbacks();
         this.initConnCallbacks();
         this.servConn = new connection_1.IOBrokerConnection({
             name: '', // optional - default 'vis.0'
-            connLink: services_1.SettingsService.settings.ioBrokerUrl, // optional URL of the socket.io adapter
+            connLink: (_b = (_a = services_1.SettingsService.settings.ioBroker) === null || _a === void 0 ? void 0 : _a.ioBrokerUrl) !== null && _b !== void 0 ? _b : services_1.SettingsService.settings.ioBrokerUrl,
             socketSession: '', // optional - used by authentication
         }, this.connectionCallbacks);
         ioBrokerMain.iOConnection = this.servConn;
@@ -26,7 +27,7 @@ class ioBrokerMain {
         ioBrokerMain.roomConstructors[roomName] = constr;
     }
     static initRooms() {
-        services_1.ServerLogService.writeLog(models_1.LogLevel.Info, `Recieved ioConnection initializing rooms now.`);
+        services_1.ServerLogService.writeLog(models_1.LogLevel.Info, 'Recieved ioConnection initializing rooms now.');
         for (const key in ioBrokerMain.roomConstructors) {
             new ioBrokerMain.roomConstructors[key]();
         }
@@ -51,8 +52,14 @@ class ioBrokerMain {
         this.connectionCallbacks.onUpdate = (id, state) => {
             services_1.Utils.guardedNewThread(() => {
                 // console.log('NEW VALUE of ' + id + ': ' + JSON.stringify(state));
-                this.states[id] = state;
-                this.deviceUpdater.updateState(id, state);
+                try {
+                    this.states[id] = state;
+                    this.deviceUpdater.updateState(id, state);
+                }
+                catch (e) {
+                    services_1.ServerLogService.writeLog(models_1.LogLevel.Alert, `Update of state (${id}) to ${state} failed: ${e}`);
+                    return;
+                }
             }, this);
         };
         this.connectionCallbacks.onError = (err) => {
@@ -63,7 +70,7 @@ class ioBrokerMain {
         var _a, _b;
         const allStates = {};
         if (((_a = services_1.SettingsService.settings.ioBroker) === null || _a === void 0 ? void 0 : _a.useSplitInitialization) !== true) {
-            this.processAllStates((_b = (await this.getStatesRange(`*`))) !== null && _b !== void 0 ? _b : {});
+            this.processAllStates((_b = (await this.getStatesRange('*'))) !== null && _b !== void 0 ? _b : {});
             return;
         }
         for (const char of ioBrokerMain.SplitKeys) {

package/lib/server/ioBroker/iobrokerConnectionLogging.d.ts

@@ -7,6 +7,9 @@ export declare enum iobrokerConnectionLogLevel {
     DeepTrace = 6
 }
 export declare class iobrokerConnectionLogging {
+    /**
+     * The LogLevel for the iobrokerConnectionLogging
+     */
     static LogLevel: number;
     static writeLog(pLevel: iobrokerConnectionLogLevel, pMessage: string): void;
 }

package/lib/server/ioBroker/iobrokerConnectionLogging.js

@@ -10,6 +10,7 @@ var iobrokerConnectionLogLevel;
     iobrokerConnectionLogLevel[iobrokerConnectionLogLevel["Trace"] = 5] = "Trace";
     iobrokerConnectionLogLevel[iobrokerConnectionLogLevel["DeepTrace"] = 6] = "DeepTrace";
 })(iobrokerConnectionLogLevel || (exports.iobrokerConnectionLogLevel = iobrokerConnectionLogLevel = {}));
+// TODO: Migrate to normale Log-Service
 class iobrokerConnectionLogging {
     static writeLog(pLevel, pMessage) {
         if (pLevel > iobrokerConnectionLogging.LogLevel) {
@@ -30,4 +31,7 @@ class iobrokerConnectionLogging {
     }
 }
 exports.iobrokerConnectionLogging = iobrokerConnectionLogging;
+/**
+ * The LogLevel for the iobrokerConnectionLogging
+ */
 iobrokerConnectionLogging.LogLevel = 5;

package/lib/server/ioBroker/socketIOConnectOptions.d.ts

@@ -1,6 +1,6 @@
 export declare class SocketIOConnectOpts {
     name?: string;
-    connLink?: any;
-    socketSession?: any;
+    connLink?: string;
+    socketSession?: unknown;
     socketForceWebSockets?: boolean;
 }

package/lib/server/ioBroker/socketIOConnectOptions.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SocketIOConnectOpts = void 0;
+/* eslint-disable jsdoc/require-jsdoc */
 class SocketIOConnectOpts {
 }
 exports.SocketIOConnectOpts = SocketIOConnectOpts;

package/lib/server/ioBroker/socketIOVisCommand.d.ts

@@ -2,5 +2,9 @@ export declare class SocketIOVisCommand {
     command: string;
     data: string;
     instance: string;
-    constructor(pObject: any);
+    constructor(pObject: {
+        command: string;
+        data: string;
+        instance: string;
+    });
 }

package/lib/server/ioBroker/socketIOVisCommand.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SocketIOVisCommand = void 0;
+/* eslint-disable jsdoc/require-jsdoc */
 class SocketIOVisCommand {
     constructor(pObject) {
         this.command = pObject.command;

package/lib/server/services/ShutterService.js

@@ -17,12 +17,12 @@ class ShutterService {
         rollos.sort((a, b) => {
             return b.currentLevel - a.currentLevel;
         });
-        const response = [`Dies sind die aktuellen Rollo Positionen:`];
+        const response = ['Dies sind die aktuellen Rollo Positionen:'];
         for (const r of rollos) {
             response.push(`${r.currentLevel}% Rollo: "${r.info.customName}" Gewünschte Position: ${r.desiredWindowShutterLevel}`);
         }
-        response.push(`\nDie nächsten Zeiten zum Hochfahren:`);
-        const down = [`\nDie nächsten Zeiten zum Runterfahren:`];
+        response.push('\nDie nächsten Zeiten zum Hochfahren:');
+        const down = ['\nDie nächsten Zeiten zum Runterfahren:'];
         for (const r of api_1.API.getRooms().values()) {
             if (!r.WindowGroup) {
                 continue;
@@ -30,10 +30,10 @@ class ShutterService {
             for (const f of r.WindowGroup.windows) {
                 f.getShutter().forEach((shutter) => {
                     var _a, _b, _c, _d, _e;
-                    response.push(`Rollo: "${shutter.info.customName}"\t${((_a = shutter.room) === null || _a === void 0 ? void 0 : _a.settings.sonnenAufgangRollos) === true
+                    response.push(`Shutter: "${shutter.info.customName}"\t${((_a = shutter.room) === null || _a === void 0 ? void 0 : _a.settings.sonnenAufgangRollos) === true
                         ? (_c = (_b = r.sunriseShutterCallback) === null || _b === void 0 ? void 0 : _b.nextToDo) === null || _c === void 0 ? void 0 : _c.toLocaleTimeString()
-                        : 'Hochfahren inaktiv'}`);
-                    down.push(`Rollo: "${shutter.info.customName}"\t${(_e = (_d = r.sunsetShutterCallback) === null || _d === void 0 ? void 0 : _d.nextToDo) === null || _e === void 0 ? void 0 : _e.toLocaleTimeString()}`);
+                        : 'Sunrise Shutter up inactive'}`);
+                    down.push(`Shutter: "${shutter.info.customName}"\t${(_e = (_d = r.sunsetShutterCallback) === null || _d === void 0 ? void 0 : _d.nextToDo) === null || _e === void 0 ? void 0 : _e.toLocaleTimeString('de-DE')}`);
                 });
             }
         }
@@ -46,6 +46,7 @@ class ShutterService {
             const d = devices_1.Devices.alLDevices[dID];
             if (d.deviceType === devices_1.DeviceType.HmIpRoll ||
                 d.deviceType === devices_1.DeviceType.ZigbeeIlluShutter ||
+                d.deviceType === devices_1.DeviceType.VeluxShutter ||
                 d.deviceType === devices_1.DeviceType.ZigbeeUbisysShutter) {
                 rollos.push(d);
             }

package/lib/server/services/Sonos/OwnSonosDevices.d.ts

@@ -1,5 +1,8 @@
 import { OwnSonosDevice } from './own-sonos-device';
 export declare class OwnSonosDevices {
+    /**
+     * A Map containing all Sonos devices in the house identified by {@link OwnSonosDevice.discoveryName}
+     */
     static ownDevices: {
         [name: string]: OwnSonosDevice;
     };

package/lib/server/services/Sonos/OwnSonosDevices.js

@@ -10,4 +10,7 @@ class OwnSonosDevices {
     }
 }
 exports.OwnSonosDevices = OwnSonosDevices;
+/**
+ * A Map containing all Sonos devices in the house identified by {@link OwnSonosDevice.discoveryName}
+ */
 OwnSonosDevices.ownDevices = {};

package/lib/server/services/Sonos/mp3-server.d.ts

@@ -1,7 +1,9 @@
 import { iMp3Settings } from '../../config';
 export declare class MP3Server {
+    /**
+     * Whether this service is active
+     */
     static active: boolean;
-    count: number;
     private mp3Path;
     constructor(settings: iMp3Settings);
 }

package/lib/server/services/Sonos/mp3-server.js

@@ -31,7 +31,6 @@ const log_service_1 = require("../log-service");
 const models_1 = require("../../../models");
 class MP3Server {
     constructor(settings) {
-        this.count = 0;
         this.mp3Path = '';
         if (!settings) {
             return;
@@ -91,4 +90,7 @@ class MP3Server {
     }
 }
 exports.MP3Server = MP3Server;
+/**
+ * Whether this service is active
+ */
 MP3Server.active = false;

package/lib/server/services/Sonos/own-sonos-device.d.ts

@@ -5,15 +5,18 @@ import { LogDebugType } from '../log-service';
 import { DeviceCapability } from '../../devices/DeviceCapability';
 export declare class OwnSonosDevice implements iSpeaker {
     device: SonosDevice | undefined;
+    /** @inheritDoc */
     settings: SonosDeviceSettings;
+    /** @inheritDoc */
     readonly deviceType: DeviceType;
+    /** @inheritDoc */
     readonly discoveryName: string;
+    /** @inheritDoc */
     readonly deviceCapabilities: DeviceCapability[];
     get customName(): string;
     constructor(discoveryName: string, roomName: string, device: SonosDevice | undefined);
     protected _info: DeviceInfo;
     get info(): DeviceInfo;
-    set info(info: DeviceInfo);
     get room(): RoomBase | undefined;
     get id(): string;
     get name(): string;

package/lib/server/services/Sonos/own-sonos-device.js

@@ -20,8 +20,11 @@ class OwnSonosDevice {
     }
     constructor(discoveryName, roomName, device) {
         this.device = device;
+        /** @inheritDoc */
         this.settings = new models_1.SonosDeviceSettings();
+        /** @inheritDoc */
         this.deviceType = devices_1.DeviceType.Sonos;
+        /** @inheritDoc */
         this.deviceCapabilities = [DeviceCapability_1.DeviceCapability.speaker];
         this.discoveryName = discoveryName;
         this._info = new devices_1.DeviceInfo();
@@ -36,9 +39,6 @@ class OwnSonosDevice {
     get info() {
         return this._info;
     }
-    set info(info) {
-        this._info = info;
-    }
     get room() {
         return api_1.API.getRoom(this.info.room);
     }
@@ -52,7 +52,7 @@ class OwnSonosDevice {
     playOnDevice(mp3Name, duration, volume = undefined, onlyWhenPlaying = undefined, resolveAfterRevert = false) {
         var _a, _b;
         if (((_a = settings_service_1.SettingsService.settings.mp3Server) === null || _a === void 0 ? void 0 : _a.serverAddress) === undefined) {
-            log_service_1.ServerLogService.writeLog(models_1.LogLevel.Alert, `Sonos: Can't speak as we have no mp3Server`);
+            log_service_1.ServerLogService.writeLog(models_1.LogLevel.Alert, "Sonos: Can't speak as we have no mp3Server");
             return;
         }
         const specificTimeout = Math.ceil(duration / 1000) + 5;

package/lib/server/services/Sonos/polly-service.d.ts

@@ -1,9 +1,15 @@
 import AWS from 'aws-sdk';
 import { iPollySettings } from '../../config';
 export declare class PollyService {
+    /**
+     * Whether Polly-Service is active
+     */
     static active: boolean;
+    /**
+     * The API Instance
+     */
     static polly: AWS.Polly;
-    static voice: string;
+    private static _voice;
     private static _mp3Path;
     static initialize(config: iPollySettings): void;
     static getDuration(filename: string): number;

package/lib/server/services/Sonos/polly-service.js

@@ -48,14 +48,13 @@ class PollyService {
                 secretAccessKey: config.secretAccessKey,
             },
         });
-        this.voice = config.voiceID;
+        this._voice = config.voiceID;
     }
     static getDuration(filename) {
         const fPath = path_1.default.join(this._mp3Path, filename);
         try {
             if (fs.existsSync(fPath)) {
-                const duration = (0, get_mp3_duration_1.default)(fs.readFileSync(fPath));
-                return duration;
+                return (0, get_mp3_duration_1.default)(fs.readFileSync(fPath));
             }
         }
         catch (err) {
@@ -77,7 +76,7 @@ class PollyService {
         });
     }
     static tts(text, cb) {
-        const hash = `${this.voice}_${crypto_1.default.createHash('md5').update(text).digest('hex')}`;
+        const hash = `${this._voice}_${crypto_1.default.createHash('md5').update(text).digest('hex')}`;
         const fPath = `${this._mp3Path}${hash}.mp3`;
         try {
             if (fs.existsSync(fPath)) {
@@ -93,7 +92,7 @@ class PollyService {
         const params = {
             Text: text,
             OutputFormat: 'mp3',
-            VoiceId: this.voice,
+            VoiceId: this._voice,
         };
         this.polly.synthesizeSpeech(params, (err, data) => {
             if (err) {
@@ -101,17 +100,17 @@ class PollyService {
                 return;
             }
             if (!data || data.AudioStream === undefined) {
-                log_service_1.ServerLogService.writeLog(models_1.LogLevel.Error, `AWS Polly didn't send any data`);
+                log_service_1.ServerLogService.writeLog(models_1.LogLevel.Error, "AWS Polly didn't send any data");
                 return;
             }
             log_service_1.ServerLogService.writeLog(models_1.LogLevel.Debug, `AWS Antwort für (${hash}) erhalten Text: "${text}"`);
             fs.writeFile(fPath, data.AudioStream, (err) => {
                 const duration = (0, get_mp3_duration_1.default)(data.AudioStream);
                 if (err) {
-                    log_service_1.ServerLogService.writeLog(models_1.LogLevel.Error, `AWS Polly: Saving failed`);
+                    log_service_1.ServerLogService.writeLog(models_1.LogLevel.Error, 'AWS Polly: Saving failed');
                     return;
                 }
-                log_service_1.ServerLogService.writeLog(models_1.LogLevel.Trace, `AWS Polly: Saving sucessfully`);
+                log_service_1.ServerLogService.writeLog(models_1.LogLevel.Trace, 'AWS Polly: Saving sucessfully');
                 cb(hash, duration);
                 return;
             });
@@ -119,4 +118,7 @@ class PollyService {
     }
 }
 exports.PollyService = PollyService;
+/**
+ * Whether Polly-Service is active
+ */
 PollyService.active = false;

package/lib/server/services/Sonos/sonos-service.d.ts

@@ -1,15 +1,11 @@
-import { SonosDevice } from '@svrooij/sonos/lib';
 import { OwnSonosDevice } from './own-sonos-device';
 export declare class SonosService {
-    static all: SonosDevice[];
-    static devicesDict: {
-        [name: string]: SonosDevice;
-    };
     private static sonosManager;
     private static ownDevices;
     private static isInitialized;
     private static checkTimeCallback;
     private static reinitializationDevice;
+    private static get config();
     static addOwnDevices(snDevices: {
         [name: string]: OwnSonosDevice;
     }, reinitializationDevice?: OwnSonosDevice): void;