hoffmation-base 1.0.3 → 1.0.6

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

@@ -41,7 +41,7 @@ class SonosService {
                 if (m.from === undefined)
                     return false;
                 SonosService.speakTestMessageOnEachDevice();
-                Telegram_1.TelegramService.sendMessage([m.from.id], 'Testnachricht gesprochen --> Führe weiteren Test durch');
+                Telegram_1.TelegramService.sendMessage([m.chat.id], 'Testnachricht gesprochen --> Führe weiteren Test durch');
                 await SonosService.checkAll();
                 return true;
             }, `Spiele eine kurze Nachricht auf allen Sonos Geräten um diese zu identifizieren`));
@@ -73,6 +73,7 @@ class SonosService {
             for (const deviceName in this.ownDevices) {
                 currentDevice = this.ownDevices[deviceName];
                 if ((currentDevice === null || currentDevice === void 0 ? void 0 : currentDevice.device) === undefined) {
+                    // noinspection ExceptionCaughtLocallyJS
                     throw `${currentDevice === null || currentDevice === void 0 ? void 0 : currentDevice.name} is missing`;
                 }
                 await currentDevice.device.GetState();

package/lib/server/services/Telegram/telegram-Commands.js

@@ -12,7 +12,7 @@ class TelegramCommands {
             if (m.from === undefined)
                 return false;
             room_service_1.RoomService.clearAllAlarms();
-            telegram_service_1.TelegramService.sendMessage([m.from.id], 'Alle ausgelösten Wasser-/Rauchmelder und Eindringlingsalarme wurden gestoppt.');
+            telegram_service_1.TelegramService.sendMessage([m.chat.id], 'Alle ausgelösten Wasser-/Rauchmelder und Eindringlingsalarme wurden gestoppt.');
             return true;
         }, 'Eine Möglichkeit bei Fehlalarm den Alarm abzuschalten'));
         telegram_service_1.TelegramService.addMessageCallback(new telegramMessageCalback_1.TelegramMessageCallback('AwayModeStart', /\/away_mode_start/, async (m) => {
@@ -33,62 +33,62 @@ class TelegramCommands {
             if (m.from === undefined)
                 return false;
             room_service_1.RoomService.endAlarmModes();
-            telegram_service_1.TelegramService.sendMessage([m.from.id], 'Der Abwesenheitsmodus ist deaktiviert.');
+            telegram_service_1.TelegramService.sendMessage([m.chat.id], 'Der Abwesenheitsmodus ist deaktiviert.');
             return true;
         }, 'Alarmanlage nach Abwesenheit/Nacht entschärfen'));
         telegram_service_1.TelegramService.addMessageCallback(new telegramMessageCalback_1.TelegramMessageCallback('LastMovements', /\/check_movement/, async (m) => {
             if (m.from === undefined)
                 return false;
-            telegram_service_1.TelegramService.sendMessage([m.from.id], `Im Folgenden sind die letzten Bewegungen\n${room_service_1.RoomService.getLastMovements()}`);
+            telegram_service_1.TelegramService.sendMessage([m.chat.id], `Im Folgenden sind die letzten Bewegungen\n${room_service_1.RoomService.getLastMovements()}`);
             return true;
         }, 'Gibt die letzten Bewegungen inkl. ihrer Uhrzeit aus.'));
         telegram_service_1.TelegramService.addMessageCallback(new telegramMessageCalback_1.TelegramMessageCallback('TelegramTest', /\/test/, async (m) => {
             if (m.from === undefined)
                 return false;
-            telegram_service_1.TelegramService.sendMessage([m.from.id], 'Hallo, ich bin der HoffMation Bot.');
+            telegram_service_1.TelegramService.sendMessage([m.chat.id], 'Hallo, ich bin der HoffMation Bot.');
             return true;
         }, 'Eine Möglichkeit die Verknüpfung mit dem HoffMation Bot zu testen'));
         telegram_service_1.TelegramService.addMessageCallback(new telegramMessageCalback_1.TelegramMessageCallback('RolloObenCheck', /\/check_rollo/, async (m) => {
             if (m.from === undefined)
                 return false;
-            telegram_service_1.TelegramService.sendMessage([m.from.id], ShutterService_1.ShutterService.getRolladenPosition());
+            telegram_service_1.TelegramService.sendMessage([m.chat.id], ShutterService_1.ShutterService.getRolladenPosition());
             return true;
         }, 'Gibt die Positionen der Rollos aus, warnt über offene Rollos und nennt die nächsten Fahrten'));
         telegram_service_1.TelegramService.addMessageCallback(new telegramMessageCalback_1.TelegramMessageCallback('FensterCheck', /\/check_fenster/, async (m) => {
             if (m.from === undefined)
                 return false;
-            telegram_service_1.TelegramService.sendMessage([m.from.id], devices_1.Griffe.getGriffPosition());
+            telegram_service_1.TelegramService.sendMessage([m.chat.id], devices_1.Griffe.getGriffPosition());
             return true;
         }, 'Gibt die Positionen der Fenstergriffe aus und warnt somit über offene Fenster'));
         telegram_service_1.TelegramService.addMessageCallback(new telegramMessageCalback_1.TelegramMessageCallback('BatteryCheck', /\/check_battery/, async (m) => {
             if (m.from === undefined)
                 return Promise.resolve(false);
-            telegram_service_1.TelegramService.sendMessage([m.from.id], devices_1.Devices.getBatteryInfo());
+            telegram_service_1.TelegramService.sendMessage([m.chat.id], devices_1.Devices.getBatteryInfo());
             return Promise.resolve(true);
         }, 'Returns a list of all battery driven devices in ascending order.'));
         telegram_service_1.TelegramService.addMessageCallback(new telegramMessageCalback_1.TelegramMessageCallback('HeizungCheck', /\/check_temperatur/, async (m) => {
             if (m.from === undefined)
                 return false;
-            telegram_service_1.TelegramService.sendMessage([m.from.id], devices_1.Heizgruppen.getInfo());
+            telegram_service_1.TelegramService.sendMessage([m.chat.id], devices_1.Heizgruppen.getInfo());
             return true;
         }, 'Gibt die Namen und aktuellen Werte sämtlicher Heizgruppen aus (aktuelle Temperatur, Soll Temperatur, Ventilstellung).'));
         telegram_service_1.TelegramService.addMessageCallback(new telegramMessageCalback_1.TelegramMessageCallback('HeizungError', /\/temperatur_error/, async (m) => {
             if (m.from === undefined)
                 return false;
-            telegram_service_1.TelegramService.sendMessage([m.from.id], devices_1.Heizgruppen.getProblems());
+            telegram_service_1.TelegramService.sendMessage([m.chat.id], devices_1.Heizgruppen.getProblems());
             return true;
         }, 'Zeigt Differenzen zwischen Heizungen und den jeweiligen Heizgruppen auf'));
         telegram_service_1.TelegramService.addMessageCallback(new telegramMessageCalback_1.TelegramMessageCallback('HeizungCheckOne', /\/check_1_temperatur.*/, async (m) => {
             if (m.from === undefined)
                 return false;
-            telegram_service_1.TelegramService.sendMessage([m.from.id], await devices_1.Heizgruppen.getSpecificInfo(m.text));
+            telegram_service_1.TelegramService.sendMessage([m.chat.id], await devices_1.Heizgruppen.getSpecificInfo(m.text));
             return true;
         }, `Gibt den Verlauf der in \\"\\" übergebenen Heizgruppe aus.`, /\/check_1_temperatur/));
         telegram_service_1.TelegramService.addMessageCallback(new telegramMessageCalback_1.TelegramMessageCallback('AllRolloDown', /\/all_rollo_down/, async (m) => {
             if (m.from === undefined)
                 return false;
             room_service_1.RoomService.setAllRolloOfFloor(-1, 0);
-            telegram_service_1.TelegramService.sendMessage([m.from.id], `Es werden alle Rollos heruntergefahren`);
+            telegram_service_1.TelegramService.sendMessage([m.chat.id], `Es werden alle Rollos heruntergefahren`);
             return true;
         }, `Fährt alle rollos runter`));
         telegram_service_1.TelegramService.addMessageCallback(new telegramMessageCalback_1.TelegramMessageCallback('VibrationSensitivity', /\/set_vibration_sensitivity/, async (m) => {
@@ -100,7 +100,7 @@ class TelegramCommands {
                     d.setSensitivity(2);
                 }
             }
-            telegram_service_1.TelegramService.sendMessage([m.from.id], 'Abgeschlossen');
+            telegram_service_1.TelegramService.sendMessage([m.chat.id], 'Abgeschlossen');
             return true;
         }, `Setzt alle Vibrationsensoren auf High`));
         telegram_service_1.TelegramService.addMessageCallback(new telegramMessageCalback_1.TelegramMessageCallback('AllButtonAssignments', /\/get_all_button_assignments/, async (m) => {
@@ -113,7 +113,7 @@ class TelegramCommands {
                     response.push(d.getButtonAssignment());
                 }
             }
-            telegram_service_1.TelegramService.sendMessage([m.from.id], response.join('\n'));
+            telegram_service_1.TelegramService.sendMessage([m.chat.id], response.join('\n'));
             return true;
         }, `Retrieves the button assignments for all buttons in home`));
         if (devices_1.Devices.energymanager !== undefined) {
@@ -128,7 +128,7 @@ class TelegramCommands {
                 response.push(`Drawing Wattage: ${(_d = devices_1.Devices.energymanager) === null || _d === void 0 ? void 0 : _d.drawingWattage}W`);
                 response.push(`Self Consuming Wattage: ${(_e = devices_1.Devices.energymanager) === null || _e === void 0 ? void 0 : _e.selfConsumingWattage}W`);
                 response.push(`Injecting Wattage: ${(_f = devices_1.Devices.energymanager) === null || _f === void 0 ? void 0 : _f.injectingWattage}W`);
-                telegram_service_1.TelegramService.sendMessage([m.from.id], response.join('\n'));
+                telegram_service_1.TelegramService.sendMessage([m.chat.id], response.join('\n'));
                 return true;
             }, `Retrieves the current energy manager values`));
         }

package/lib/server/services/Telegram/telegram-service.js

@@ -46,7 +46,6 @@ class TelegramService {
             log_service_1.ServerLogService.writeLog(models_1.LogLevel.Trace, `Telegram Polling Error stack: ${e.stack}`);
         });
         TelegramService.addMessageCallback(new telegramMessageCalback_1.TelegramMessageCallback('helpCommand', /\/help/, async (m) => {
-            var _a;
             if (m.from === undefined)
                 return true;
             const message = [];
@@ -55,7 +54,7 @@ class TelegramService {
                 const telegramCb = TelegramService.callbacks[cName];
                 message.push(`${telegramCb.identifier.toString().replace(/\//g, '').replace(/\\/g, '')} - ${telegramCb.helpMessage}`);
             }
-            TelegramService.sendMessage([(_a = m.from) === null || _a === void 0 ? void 0 : _a.id], message.join('\n'));
+            TelegramService.sendMessage([m.chat.id], message.join('\n'));
             return true;
         }, `Gibt eine Liste mit sämtlichen Kommandos aus`));
         TelegramService.inform(`(Re-)Initialisierung abgeschlossen`);
@@ -97,7 +96,7 @@ class TelegramService {
     }
     static checkAuthorized(msg) {
         var _a;
-        if (msg.from !== undefined && this.allowedIDs.includes((_a = msg.from) === null || _a === void 0 ? void 0 : _a.id)) {
+        if ((msg.from !== undefined && this.allowedIDs.includes((_a = msg.from) === null || _a === void 0 ? void 0 : _a.id)) || this.allowedIDs.includes(msg.chat.id)) {
             log_service_1.ServerLogService.writeLog(models_1.LogLevel.Debug, `Authorisierte Telegram Message erhalten: ${JSON.stringify(msg)}`);
             return true;
         }

package/lib/server/services/ac/ac-device.d.ts

@@ -17,7 +17,7 @@ export declare abstract class AcDevice implements iExcessEnergyConsumer {
      * @param {number} timeout
      */
     deactivateAutomaticTurnOn(timeout?: number): void;
-    abstract setDesiredMode(mode: AcMode): void;
+    abstract setDesiredMode(mode: AcMode, writeToDevice: boolean): void;
     abstract turnOn(): void;
     turnOnForExcessEnergy(): void;
     abstract turnOff(): void;

package/lib/server/services/ac/daikin-service.js

@@ -31,14 +31,14 @@ class DaikinService {
             if (m.from === undefined)
                 return false;
             DaikinService.setAll(true);
-            Telegram_1.TelegramService.sendMessage([m.from.id], 'Command executed');
+            Telegram_1.TelegramService.sendMessage([m.chat.id], 'Command executed');
             return true;
         }, `Turns all Ac's on without changing any settings`));
         Telegram_1.TelegramService.addMessageCallback(new Telegram_1.TelegramMessageCallback('AcOff', /\/ac_off/, async (m) => {
             if (m.from === undefined)
                 return false;
             DaikinService.setAll(false, true);
-            Telegram_1.TelegramService.sendMessage([m.from.id], 'Command executed');
+            Telegram_1.TelegramService.sendMessage([m.chat.id], 'Command executed');
             return true;
         }, `Turns all Ac's off without changing any settings`));
         return new Promise((res, _rej) => {
@@ -61,6 +61,9 @@ class DaikinService {
         });
     }
     static setAll(on, force = false) {
+        if (!this.isInitialized) {
+            return;
+        }
         for (const deviceName in this._ownDevices) {
             const dev = this._ownDevices[deviceName];
             if (on) {

package/lib/server/services/ac/own-daikin-device.d.ts

@@ -11,9 +11,11 @@ export declare class OwnDaikinDevice extends AcDevice {
     get device(): DaikinAC | undefined;
     set device(device: DaikinAC | undefined);
     get on(): boolean;
-    setDesiredMode(mode: AcMode): void;
+    setDesiredMode(mode: AcMode, writeToDevice?: boolean): void;
     turnOn(): void;
     turnOff(): void;
     private setDesiredInfo;
+    private handleDeviceUnreach;
+    private handleParamNg;
     private logInfo;
 }

package/lib/server/services/ac/own-daikin-device.js

@@ -42,7 +42,7 @@ class OwnDaikinDevice extends ac_device_1.AcDevice {
         var _a, _b, _c;
         return (_c = (_b = (_a = this._device) === null || _a === void 0 ? void 0 : _a.currentACControlInfo) === null || _b === void 0 ? void 0 : _b.power) !== null && _c !== void 0 ? _c : false;
     }
-    setDesiredMode(mode) {
+    setDesiredMode(mode, writeToDevice = true) {
         let newMode = -1;
         switch (mode) {
             case ac_mode_1.AcMode.Heating:
@@ -59,7 +59,9 @@ class OwnDaikinDevice extends ac_device_1.AcDevice {
             return;
         }
         this.desiredMode = newMode;
-        this.setDesiredInfo();
+        if (writeToDevice) {
+            this.setDesiredInfo();
+        }
     }
     turnOn() {
         this.desiredState = daikin_controller_1.Power.ON;
@@ -85,15 +87,13 @@ class OwnDaikinDevice extends ac_device_1.AcDevice {
             if (err !== null) {
                 log_service_1.ServerLogService.writeLog(models_1.LogLevel.Warn, `Setting Ac Info for ${this.name} failed:  ${err} `);
                 if (err.message.includes('EHOSTUNREACH') && !retry) {
-                    this.log(models_1.LogLevel.Warn, `Detected EHOSTUNREACH, will try reconecting`);
-                    daikin_service_1.DaikinService.reconnect(this.name, this.ip).then((device) => {
-                        this.device = device;
-                        utils_1.Utils.guardedTimeout(() => {
-                            this.setDesiredInfo(true);
-                        }, 5000, this);
-                    });
+                    this.handleDeviceUnreach();
+                    return;
+                }
+                else if (err.message.includes('ret=PARAM NG') && !retry) {
+                    this.handleParamNg();
+                    return;
                 }
-                return;
             }
             else if (res) {
                 this.log(models_1.LogLevel.Info, `Changing Ac ${this.name} Settings was successful`);
@@ -104,6 +104,25 @@ class OwnDaikinDevice extends ac_device_1.AcDevice {
             }
         });
     }
+    handleDeviceUnreach() {
+        this.log(models_1.LogLevel.Warn, `Detected EHOSTUNREACH, will try reconecting`);
+        daikin_service_1.DaikinService.reconnect(this.name, this.ip).then((device) => {
+            this.device = device;
+            utils_1.Utils.guardedTimeout(() => {
+                this.setDesiredInfo(true);
+            }, 5000, this);
+        });
+    }
+    handleParamNg() {
+        var _a;
+        this.log(models_1.LogLevel.Warn, `Detected Param Ng, will try reloading Control Info`);
+        (_a = this._device) === null || _a === void 0 ? void 0 : _a.getACControlInfo((err) => {
+            if (err === null) {
+                this.log(models_1.LogLevel.Warn, `Device Info loaded successfull will try setting Control Info again`);
+                this.setDesiredInfo(true);
+            }
+        });
+    }
     logInfo(info) {
         this.log(models_1.LogLevel.Debug, `Device Info ${JSON.stringify(info)}`);
     }

package/lib/server/services/api/api-service.d.ts

@@ -1,7 +1,14 @@
 import { IBaseDevice } from '../../devices';
 import { RoomBase } from '../../../models';
 import { LogObject } from '../log-service';
+import { OwnDaikinDevice } from '../ac';
 export declare class API {
+    /**
+     * Gets the instance of an Daikin Device identified by name
+     * @param {string} name
+     * @returns {OwnDaikinDevice | undefined}
+     */
+    static getAc(name: string): OwnDaikinDevice | undefined;
     static getDevices(): {
         [id: string]: IBaseDevice;
     };
@@ -9,4 +16,22 @@ export declare class API {
     static getRooms(): Map<string, RoomBase>;
     static getRoom(id: string): RoomBase | undefined;
     static getLog(): LogObject[];
+    /**
+     * Turns on/off one AC identified by it's name
+     * @param name The name of the device, if wrong false will be returned
+     * @param {boolean} desiredState
+     */
+    static setAc(name: string, desiredState: boolean): boolean;
+    /**
+     * Turns on/off all AC´s in the home
+     * @param {boolean} desiredState
+     */
+    static setAllAc(desiredState: boolean): void;
+    /**
+     * Changes the status of a given Lamp
+     * @param {string} deviceId The device Id of the lamp
+     * @param {boolean} state The desired new state
+     * @returns {Error | null} In case it failed the Error containing the reason
+     */
+    static setLight(deviceId: string, state: boolean): Error | null;
 }

package/lib/server/services/api/api-service.js

@@ -5,7 +5,16 @@ const devices_1 = require("../../devices");
 const models_1 = require("../../../models");
 const room_service_1 = require("../room-service");
 const log_service_1 = require("../log-service");
+const ac_1 = require("../ac");
 class API {
+    /**
+     * Gets the instance of an Daikin Device identified by name
+     * @param {string} name
+     * @returns {OwnDaikinDevice | undefined}
+     */
+    static getAc(name) {
+        return ac_1.OwnDaikinDevices.ownDevices[name];
+    }
     static getDevices() {
         // console.log(inspect(Devices.alLDevices, false, 3));
         return devices_1.Devices.alLDevices;
@@ -27,5 +36,48 @@ class API {
     static getLog() {
         return log_service_1.ServerLogService.getLog();
     }
+    /**
+     * Turns on/off one AC identified by it's name
+     * @param name The name of the device, if wrong false will be returned
+     * @param {boolean} desiredState
+     */
+    static setAc(name, desiredState) {
+        const d = this.getAc(name);
+        if (!d) {
+            log_service_1.ServerLogService.writeLog(models_1.LogLevel.Warn, `Daikin Device for name ${name} not found`);
+            return false;
+        }
+        if (desiredState) {
+            d.turnOn();
+        }
+        else {
+            d.deactivateAutomaticTurnOn(60 * 60 * 1000);
+        }
+        return true;
+    }
+    /**
+     * Turns on/off all AC´s in the home
+     * @param {boolean} desiredState
+     */
+    static setAllAc(desiredState) {
+        ac_1.DaikinService.setAll(desiredState, true);
+    }
+    /**
+     * Changes the status of a given Lamp
+     * @param {string} deviceId The device Id of the lamp
+     * @param {boolean} state The desired new state
+     * @returns {Error | null} In case it failed the Error containing the reason
+     */
+    static setLight(deviceId, state) {
+        const d = this.getDevice(deviceId);
+        if (d === undefined) {
+            return new Error(`Device with ID ${deviceId} not found`);
+        }
+        if (typeof d.setLight !== 'function') {
+            return new Error(`Device with ID ${deviceId} is no Lamp`);
+        }
+        d.setLight(state, 60 * 60 * 1000, true);
+        return null;
+    }
 }
 exports.API = API;

package/lib/server/services/utils/utils.js

@@ -76,7 +76,7 @@ class Utils {
     }
     static jsonFilter(object) {
         return lodash_1.default.omit(object, Object.keys(object).filter((key) => {
-            if (key.includes('Timeout') || key.includes('Interval')) {
+            if (key.includes('Timeout') || key.includes('Interval') || key.includes('timeouts')) {
                 // Exclude timeout Variables.
                 return true;
             }