hoffmation-base 1.0.5 → 1.0.8

package/lib/server/config/iConfig.d.ts

@@ -43,6 +43,11 @@ export interface iConfig {
 export interface iLogSettings {
     logLevel: number;
     useTimestamp: boolean;
+    debugNewMovementState?: boolean;
+    debugShutterPositionChange?: boolean;
+    debugActuatorChange?: boolean;
+    debugUchangedShutterPosition?: boolean;
+    debugUnchangedActuator?: boolean;
 }
 export interface iTimePair {
     hours: number;

package/lib/server/devices/IoBrokerBaseDevice.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="iobroker" />
 import { IBaseDevice } from './baseDeviceInterfaces';
+import { LogDebugType } from '../services';
 import { DeviceInfo } from './DeviceInfo';
 import { LogLevel, RoomBase, RoomDeviceAddingSettings } from '../../models';
 import { IOBrokerConnection } from '../ioBroker';
@@ -37,7 +38,7 @@ export declare abstract class IoBrokerBaseDevice implements IBaseDevice {
      */
     checkIoConnection(showError?: boolean): boolean;
     abstract update(idSplit: string[], state: ioBroker.State, initial: boolean, pOverride: boolean): void;
-    log(level: LogLevel, message: string): void;
+    log(level: LogLevel, message: string, logDebugType?: LogDebugType): void;
     toJSON(): Partial<IoBrokerBaseDevice>;
     protected addToCorrectRoom(): void;
     /**

package/lib/server/devices/IoBrokerBaseDevice.js

@@ -61,11 +61,12 @@ class IoBrokerBaseDevice {
         }
         return this.ioConn !== undefined;
     }
-    log(level, message) {
+    log(level, message, logDebugType = services_1.LogDebugType.None) {
         services_1.ServerLogService.writeLog(level, message, {
             room: this.info.room,
             deviceId: this.id,
             deviceName: this.info.customName,
+            debugType: logDebugType,
         });
     }
     toJSON() {

package/lib/server/devices/hmIPDevices/hmIpLampe.js

@@ -31,7 +31,7 @@ class HmIpLampe extends hmIpDevice_1.HmIPDevice {
     /** @inheritdoc */
     setLight(pValue, timeout = -1, force = false) {
         if (!force && pValue === this.lightOn && this.queuedLightValue === null) {
-            this.log(models_1.LogLevel.DeepTrace, `Skip light command as it is already ${pValue}`);
+            this.log(models_1.LogLevel.DeepTrace, `Skip light command as it is already ${pValue}`, services_1.LogDebugType.SkipUnchangedActuatorCommand);
             return;
         }
         if (this.lightOnSwitchID === '') {
@@ -42,7 +42,7 @@ class HmIpLampe extends hmIpDevice_1.HmIPDevice {
             this.log(models_1.LogLevel.Debug, `Skip automatic command to ${pValue} as it is locked until ${new Date(this.turnOffTime).toLocaleString()}`);
             return;
         }
-        this.log(models_1.LogLevel.Debug, `Lampe schalten Wert: ${pValue}`);
+        this.log(models_1.LogLevel.Debug, `Set Light Acutator to "${pValue}"`, services_1.LogDebugType.SetActuator);
         this.setState(this.lightOnSwitchID, pValue, undefined, (err) => {
             this.log(models_1.LogLevel.Error, `Lampe schalten ergab Fehler: ${err}`);
         });

package/lib/server/devices/hmIPDevices/hmIpRoll.js

@@ -69,7 +69,7 @@ class HmIpRoll extends hmIpDevice_1.HmIPDevice {
             return;
         }
         if (this.currentLevel === pPosition) {
-            this.log(models_2.LogLevel.Debug, `Skip Rollo command to Position ${pPosition} as this is the current one`);
+            this.log(models_2.LogLevel.Debug, `Skip Rollo command to Position ${pPosition} as this is the current one`, services_1.LogDebugType.SkipUnchangedRolloPosition);
             return;
         }
         if (this._setLevelSwitchID === '') {

package/lib/server/devices/zigbee/BaseDevices/ZigbeeActuator.js

@@ -37,10 +37,10 @@ class ZigbeeActuator extends zigbeeDevice_1.ZigbeeDevice {
             return;
         }
         if (!force && pValue === this.actuatorOn && this.queuedValue === null) {
-            this.log(models_1.LogLevel.Debug, `Skip actuator command as it is already ${pValue}`);
+            this.log(models_1.LogLevel.Debug, `Skip actuator command as it is already ${pValue}`, services_1.LogDebugType.SkipUnchangedActuatorCommand);
             return;
         }
-        this.log(models_1.LogLevel.Debug, `Switch actuator to: ${pValue}`);
+        this.log(models_1.LogLevel.Debug, `Set outlet Acutator to "${pValue}"`, services_1.LogDebugType.SetActuator);
         this.setState(this.actuatorOnSwitchID, pValue, undefined, (err) => {
             this.log(models_1.LogLevel.Error, `Switching actuator resulted in error: ${err}`);
         });

package/lib/server/devices/zigbee/BaseDevices/zigbeeShutter.js

@@ -70,7 +70,7 @@ class ZigbeeShutter extends zigbeeDevice_1.ZigbeeDevice {
             return;
         }
         if (this.currentLevel === pPosition) {
-            this.log(models_1.LogLevel.Debug, `Skip Rollo command to Position ${pPosition} as this is the current one`);
+            this.log(models_1.LogLevel.Debug, `Skip Rollo command to Position ${pPosition} as this is the current one`, services_1.LogDebugType.SkipUnchangedRolloPosition);
             return;
         }
         if (this._fenster !== undefined) {

package/lib/server/devices/zigbee/zigbeeIlluDimmer.js

@@ -88,7 +88,7 @@ class ZigbeeIlluDimmer extends BaseDevices_1.ZigbeeDevice {
         if (pValue && brightness === -1 && this.brightness < 10) {
             brightness = 10;
         }
-        this.log(models_1.LogLevel.Debug, `Dimmer Schalten An: ${pValue} \t Helligkeit: ${brightness}%`);
+        this.log(models_1.LogLevel.Debug, `Set Light Acutator to "${pValue}" with brightness ${brightness}`, services_1.LogDebugType.SetActuator);
         this.setState(this.stateID, pValue);
         this.queuedValue = pValue;
         if (brightness > -1) {

package/lib/server/devices/zigbee/zigbeeIlluLampe.js

@@ -22,7 +22,7 @@ class ZigbeeIlluLampe extends zigbeeIlluActuator_1.ZigbeeIlluActuator {
     }
     /** @inheritdoc */
     setLight(pValue, timeout = -1, force = false) {
-        this.log(models_1.LogLevel.Debug, `Lampenaktor schalten Wert: ${pValue}`);
+        this.log(models_1.LogLevel.Debug, `Set Light Acutator to "${pValue}"`, services_1.LogDebugType.SetActuator);
         if (this.settings.isStromStoss) {
             timeout = 3000;
             services_1.Utils.guardedTimeout(() => {

package/lib/server/devices/zigbee/zigbeeMotionSensor.js

@@ -53,7 +53,7 @@ class ZigbeeMotionSensor extends BaseDevices_1.ZigbeeDevice {
             return;
         }
         if (newState === this.movementDetected) {
-            this.log(models_1.LogLevel.Debug, `Skip movement because state is already ${newState}`);
+            this.log(models_1.LogLevel.Debug, `Skip movement because state is already ${newState}`, services_1.LogDebugType.SkipUnchangedMovementState);
             if (newState) {
                 // Wenn ein Sensor sich nicht von alleine zurücksetzt, hier erzwingen.
                 this.resetFallbackTimeout();
@@ -63,7 +63,7 @@ class ZigbeeMotionSensor extends BaseDevices_1.ZigbeeDevice {
         }
         this.resetFallbackTimeout();
         this.movementDetected = newState;
-        this.log(models_1.LogLevel.Debug, `New movement state: ${newState}`);
+        this.log(models_1.LogLevel.Debug, `New movement state: ${newState}`, services_1.LogDebugType.NewMovementState);
         if (newState) {
             this.startFallbackTimeout();
             this.detectionsToday++;

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

@@ -96,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/daikin-service.js

@@ -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/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/log-service/log-filter-data.d.ts

@@ -1,8 +1,18 @@
 import { LogSource } from '../../../models/logSource';
+export declare enum LogDebugType {
+    None = 0,
+    SkipUnchangedActuatorCommand = 1,
+    SkipUnchangedRolloPosition = 2,
+    SetActuator = 3,
+    ShutterPositionChange = 4,
+    NewMovementState = 5,
+    SkipUnchangedMovementState = 6
+}
 export declare class LogFilterData {
     room?: string;
     deviceId?: string;
     deviceName?: string;
     groupType?: string;
     source?: LogSource;
+    debugType?: LogDebugType;
 }

package/lib/server/services/log-service/log-filter-data.js

@@ -1,6 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LogFilterData = void 0;
+exports.LogFilterData = exports.LogDebugType = void 0;
+var LogDebugType;
+(function (LogDebugType) {
+    LogDebugType[LogDebugType["None"] = 0] = "None";
+    LogDebugType[LogDebugType["SkipUnchangedActuatorCommand"] = 1] = "SkipUnchangedActuatorCommand";
+    LogDebugType[LogDebugType["SkipUnchangedRolloPosition"] = 2] = "SkipUnchangedRolloPosition";
+    LogDebugType[LogDebugType["SetActuator"] = 3] = "SetActuator";
+    LogDebugType[LogDebugType["ShutterPositionChange"] = 4] = "ShutterPositionChange";
+    LogDebugType[LogDebugType["NewMovementState"] = 5] = "NewMovementState";
+    LogDebugType[LogDebugType["SkipUnchangedMovementState"] = 6] = "SkipUnchangedMovementState";
+})(LogDebugType = exports.LogDebugType || (exports.LogDebugType = {}));
 class LogFilterData {
+    constructor() {
+        this.debugType = LogDebugType.None;
+    }
 }
 exports.LogFilterData = LogFilterData;

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

@@ -15,4 +15,10 @@ export declare class ServerLogService {
     static addedDeviceToRoom(pRoomName: string, pDeviceType: DeviceType, pRoomIndex: number, forceDebug?: boolean): void;
     static missingRoomHandling(pRoomName: string, pDeviceType: DeviceType): void;
     static missingRoomIndexHandling(pRoomName: string, pIndex: number, pDeviceType: DeviceType): void;
+    /**
+     * Checks if this message is of a debugtype which should be skipped according to settings
+     * @param {LogDebugType} debugType
+     * @returns {boolean} If the Message should be skipped
+     */
+    private static checkDebugLogSkip;
 }

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

@@ -6,7 +6,9 @@ const models_1 = require("../../../models");
 const devices_1 = require("../../devices");
 const utils_1 = require("../utils");
 const log_object_1 = require("./log-object");
+const log_filter_data_1 = require("./log-filter-data");
 const logSource_1 = require("../../../models/logSource");
+const settings_service_1 = require("../settings-service");
 class ServerLogService {
     static getLog(amount = 5000) {
         return this.storage.readAmount(amount);
@@ -17,6 +19,9 @@ class ServerLogService {
     static writeLog(pLevel, pMessage, additionalLogInfo) {
         var _a;
         const now = Date.now();
+        if ((additionalLogInfo === null || additionalLogInfo === void 0 ? void 0 : additionalLogInfo.debugType) !== undefined && ServerLogService.checkDebugLogSkip(additionalLogInfo.debugType)) {
+            return;
+        }
         if (pLevel > this.storageLevel && pLevel > ServerLogService.settings.logLevel) {
             return;
         }
@@ -53,6 +58,46 @@ class ServerLogService {
     static missingRoomIndexHandling(pRoomName, pIndex, pDeviceType) {
         ServerLogService.writeLog(models_1.LogLevel.Warn, `Raum "${pRoomName}" hat keine Definition für den Typ "${devices_1.DeviceType[pDeviceType]} mit Index ${pIndex}"`);
     }
+    /**
+     * Checks if this message is of a debugtype which should be skipped according to settings
+     * @param {LogDebugType} debugType
+     * @returns {boolean} If the Message should be skipped
+     */
+    static checkDebugLogSkip(debugType) {
+        var _a, _b, _c, _d, _e;
+        switch (debugType) {
+            case log_filter_data_1.LogDebugType.None:
+                return false;
+            case log_filter_data_1.LogDebugType.SkipUnchangedActuatorCommand:
+                if (((_a = settings_service_1.SettingsService.settings.logSettings) === null || _a === void 0 ? void 0 : _a.debugUnchangedActuator) === true) {
+                    return false;
+                }
+                break;
+            case log_filter_data_1.LogDebugType.SkipUnchangedRolloPosition:
+                if (((_b = settings_service_1.SettingsService.settings.logSettings) === null || _b === void 0 ? void 0 : _b.debugUchangedShutterPosition) === true) {
+                    return false;
+                }
+                break;
+            case log_filter_data_1.LogDebugType.SetActuator:
+                if (((_c = settings_service_1.SettingsService.settings.logSettings) === null || _c === void 0 ? void 0 : _c.debugActuatorChange) === true) {
+                    return false;
+                }
+                break;
+            case log_filter_data_1.LogDebugType.ShutterPositionChange:
+                if (((_d = settings_service_1.SettingsService.settings.logSettings) === null || _d === void 0 ? void 0 : _d.debugShutterPositionChange) === true) {
+                    return false;
+                }
+                break;
+            case log_filter_data_1.LogDebugType.NewMovementState:
+                if (((_e = settings_service_1.SettingsService.settings.logSettings) === null || _e === void 0 ? void 0 : _e.debugNewMovementState) === true) {
+                    return false;
+                }
+                break;
+            case log_filter_data_1.LogDebugType.SkipUnchangedMovementState:
+                break;
+        }
+        return true;
+    }
 }
 exports.ServerLogService = ServerLogService;
 ServerLogService.telegramLevel = -1; // Controlled from within Config File

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;
             }