hoffmation-base 3.0.0-alpha.2 → 3.0.0-alpha.20

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

@@ -35,7 +35,7 @@ class ZigbeeDimmer extends index_1.ZigbeeDevice {
         return this.lightOn;
     }
     restoreTargetAutomaticValue(c) {
-        this.setActuator(new models_1.ActuatorSetStateCommand(c, this.targetAutomaticState, 'Restore targetAutomaticState due to BlockAutomaticHandler'));
+        this.setActuator(new models_1.ActuatorSetStateCommand(c, this.targetAutomaticState));
     }
     update(idSplit, state, initial = false) {
         this.queuedValue = null;
@@ -62,7 +62,7 @@ class ZigbeeDimmer extends index_1.ZigbeeDevice {
         this.setLight(models_1.DimmerSetLightCommand.byTimeBased(this.settings, c));
     }
     setActuator(c) {
-        this.setLight(new models_1.DimmerSetLightCommand(c, c.on, 'Set dimmer due to set ActuactorCommand', c.timeout));
+        this.setLight(new models_1.DimmerSetLightCommand(c, c.on, '', c.timeout));
     }
     toggleActuator(c) {
         const setActuatorCommand = models_1.ActuatorSetStateCommand.byActuatorAndToggleCommand(this, c);
@@ -82,26 +82,26 @@ class ZigbeeDimmer extends index_1.ZigbeeDevice {
             this.log(models_1.LogLevel.Error, `Keine Connection bekannt.`);
             return;
         }
-        if (c.transitionTime > -1) {
-            this.setState(this._stateIdTransitionTime, c.transitionTime);
-        }
         const dontBlock = sharedFunctions_1.LampUtils.checkUnBlock(this, c);
         if (sharedFunctions_1.LampUtils.checkBlockActive(this, c)) {
             return;
         }
+        if (c.transitionTime > -1) {
+            this.setState(this._stateIdTransitionTime, c.transitionTime);
+        }
         if (c.on && c.brightness <= 0 && this.brightness < 10) {
             c.brightness = 10;
         }
-        this.log(models_1.LogLevel.Debug, `Set Light Acutator to "${c.on}" with brightness ${c.brightness}`, services_1.LogDebugType.SetActuator);
         if (c.timeout > -1 && !dontBlock) {
-            this.blockAutomationHandler.disableAutomatic(c.timeout, models_1.CollisionSolving.overrideIfGreater);
+            this.blockAutomationHandler.disableAutomatic(new models_1.BlockAutomaticCommand(c, c.timeout));
         }
         if (((_a = services_1.SettingsService.settings.ioBroker) === null || _a === void 0 ? void 0 : _a.useZigbee2mqtt) && !c.on) {
             // With zigbee2mqtt to turn on only setting brighness>0 is needed, so we need state only for turning off
-            this.writeActuatorStateToDevice(new models_1.ActuatorWriteStateToDeviceCommand(c.on, c, 'Set dimmer due to set ActuactorCommand'));
+            this.writeActuatorStateToDevice(new models_1.ActuatorWriteStateToDeviceCommand(c, c.on));
             this.queuedValue = c.on;
             return;
         }
+        this.log(models_1.LogLevel.Debug, c.logMessage, services_1.LogDebugType.SetActuator);
         if (c.brightness >= this.settings.turnOnThreshhold) {
             this.setBrightnessState(c.brightness);
             return;

package/lib/server/devices/zigbee/BaseDevices/zigbeeLedRGBCCT.d.ts

@@ -1,5 +1,5 @@
 import { DeviceType } from '../../deviceType';
-import { LampSetTimeBasedCommand, LedSetLightCommand, LedSettings } from '../../../../models';
+import { ActuatorSetStateCommand, LampSetTimeBasedCommand, LedSetLightCommand, LedSettings } from '../../../../models';
 import { IoBrokerDeviceInfo } from '../../IoBrokerDeviceInfo';
 import { iLedRgbCct } from '../../baseDeviceInterfaces/iLedRgbCct';
 import { ZigbeeDimmer } from './zigbeeDimmer';
@@ -20,6 +20,7 @@ export declare abstract class ZigbeeLedRGBCCT extends ZigbeeDimmer implements iL
      * @inheritDoc
      */
     setTimeBased(c: LampSetTimeBasedCommand): void;
+    setActuator(c: ActuatorSetStateCommand): void;
     /**
      * @inheritDoc
      */

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

@@ -41,6 +41,9 @@ class ZigbeeLedRGBCCT extends zigbeeDimmer_1.ZigbeeDimmer {
     setTimeBased(c) {
         this.setLight(models_1.LedSetLightCommand.byTimeBased(this.settings, c));
     }
+    setActuator(c) {
+        this.setLight(new models_1.LedSetLightCommand(c, c.on, '', c.timeout));
+    }
     /**
      * @inheritDoc
      */
@@ -56,15 +59,14 @@ class ZigbeeLedRGBCCT extends zigbeeDimmer_1.ZigbeeDimmer {
         if (c.on && c.brightness === -1 && this.brightness < 10) {
             c.brightness = 10;
         }
-        this.log(models_1.LogLevel.Debug, `LED Schalten An: ${c.on}\tHelligkeit: ${c.brightness}%\tFarbe: "${c.color}"\tColorTemperatur: ${c.colorTemp}\tTransition Time: ${c.transitionTime}`);
+        super.setLight(c);
         const formattedColor = services_1.Utils.formatHex(c.color);
-        if (formattedColor !== null && c.on) {
+        if (formattedColor !== null && c.on && (c.color !== this.color || c.isForceAction)) {
             this.setState(this._stateIdColor, formattedColor);
         }
-        if (c.colorTemp > -1 && c.on) {
+        if (c.colorTemp > -1 && c.on && (c.colorTemp !== this.colortemp || c.isForceAction)) {
             this.setState(this._stateIdColorTemp, c.colorTemp);
         }
-        super.setLight(c);
     }
 }
 exports.ZigbeeLedRGBCCT = ZigbeeLedRGBCCT;

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

@@ -75,19 +75,19 @@ class ZigbeeShutter extends zigbeeDevice_1.ZigbeeDevice {
         super.update(idSplit, state, initial, pOverride);
     }
     setLevel(c) {
-        this.log(models_1.LogLevel.Debug, c.logMessage);
         let pPosition = c.level;
         if (!this._firstCommandRecieved && !c.isInitial) {
             this._firstCommandRecieved = true;
         }
         else if (this._firstCommandRecieved && c.isInitial) {
-            this.log(models_1.LogLevel.Debug, `Skipped initial Rollo  to ${pPosition} as we recieved a command already`);
+            this.log(models_1.LogLevel.Debug, `Skipped initial Rollo to ${pPosition} as we recieved a command already`);
             return;
         }
         if (this.currentLevel === pPosition && !c.isForceAction) {
-            this.log(models_1.LogLevel.Debug, `Skip Rollo command to Position ${pPosition} as this is the current one`, services_1.LogDebugType.SkipUnchangedRolloPosition);
+            this.log(models_1.LogLevel.Debug, `Skip Rollo command to Position ${pPosition} as this is the current one, commandLog: ${c.logMessage}`, services_1.LogDebugType.SkipUnchangedRolloPosition);
             return;
         }
+        this.log(models_1.LogLevel.Debug, c.logMessage);
         if (this._window !== undefined) {
             if (this._window.griffeInPosition(models_2.WindowPosition.offen) > 0 && pPosition < 100) {
                 if (!c.skipOpenWarning) {

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

@@ -37,11 +37,6 @@ export declare abstract class AcDevice implements iExcessEnergyConsumer, iRoomDe
     restoreTargetAutomaticValue(): void;
     isAvailableForExcessEnergy(): boolean;
     calculateDesiredMode(): AcMode;
-    /**
-     * Disable automatic Turn-On and Turn-Off for given amount of ms.
-     * @param {number} timeout
-     */
-    deactivateAutomaticChange(timeout?: number): void;
     abstract setDesiredMode(mode: AcMode, writeToDevice: boolean, temp?: number): void;
     abstract turnOn(): void;
     onTemperaturChange(newTemperatur: number): void;

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

@@ -52,7 +52,7 @@ class AcDevice {
         this._info.customName = `${roomName} ${name}`;
         this._info.room = roomName;
         this._info.allDevicesKey = `ac-${roomName}-${name}`;
-        utils_1.Utils.guardedInterval(this.automaticCheck, 5 * 60 * 1000, this, true);
+        utils_1.Utils.guardedInterval(this.automaticCheck, 5 * 60 * 1000, this, false);
         utils_1.Utils.guardedInterval(this.persist, 15 * 60 * 1000, this, true);
         this.persistDeviceInfo();
         this.loadDeviceSettings();
@@ -85,7 +85,8 @@ class AcDevice {
         this.automaticCheck();
     }
     isAvailableForExcessEnergy() {
-        if (this.settings.useOwnTemperatureAndAutomatic) {
+        var _a, _b;
+        if (this.settings.useAutomatic || (((_b = (_a = this.room) === null || _a === void 0 ? void 0 : _a.HeatGroup) === null || _b === void 0 ? void 0 : _b.settings.automaticMode) && this.settings.heatingAllowed)) {
             return false;
         }
         if (this.blockAutomationHandler.automaticBlockActive) {
@@ -97,9 +98,14 @@ class AcDevice {
         return this.calculateDesiredMode() !== ac_mode_1.AcMode.Off;
     }
     calculateDesiredMode() {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+        var _a, _b, _c, _d, _e, _f, _g;
         const acOn = this.on;
-        this._desiredTemperatur = (_c = (_b = (_a = this.room) === null || _a === void 0 ? void 0 : _a.HeatGroup) === null || _b === void 0 ? void 0 : _b.desiredTemp) !== null && _c !== void 0 ? _c : 0;
+        const heatGroup = (_a = this.room) === null || _a === void 0 ? void 0 : _a.HeatGroup;
+        if (!heatGroup) {
+            this.log(models_1.LogLevel.Warn, `Can't calculate AC Mode as we have no heat group`);
+            return ac_mode_1.AcMode.Off;
+        }
+        this._desiredTemperatur = heatGroup.desiredTemp;
         if (this.settings.manualDisabled) {
             acOn && this.log(models_1.LogLevel.Info, `We should turn off now, as manual disable force is set.`);
             return ac_mode_1.AcMode.Off;
@@ -109,16 +115,15 @@ class AcDevice {
             acOn && this.log(models_1.LogLevel.Info, `We should turn off now, to respect night settings.`);
             return ac_mode_1.AcMode.Off;
         }
-        const heatGroup = (_d = this.room) === null || _d === void 0 ? void 0 : _d.HeatGroup;
-        if (this.settings.useOwnTemperatureAndAutomatic) {
+        if (this.settings.useOwnTemperature) {
             // Device is in automatic mode so ignore energy and room temperature
-            if ((heatGroup === null || heatGroup === void 0 ? void 0 : heatGroup.settings.automaticMode) === false) {
+            if (this.settings.useAutomatic) {
                 return ac_mode_1.AcMode.Auto;
             }
             if (settings_service_1.SettingsService.heatMode !== config_1.HeatingMode.Sommer && this.settings.heatingAllowed) {
                 return ac_mode_1.AcMode.Heating;
             }
-            if (!this.settings.noCoolingOnMovement || ((_f = (_e = this.room) === null || _e === void 0 ? void 0 : _e.PraesenzGroup) === null || _f === void 0 ? void 0 : _f.anyPresent()) !== true) {
+            if (!this.settings.noCoolingOnMovement || ((_c = (_b = this.room) === null || _b === void 0 ? void 0 : _b.PraesenzGroup) === null || _c === void 0 ? void 0 : _c.anyPresent()) !== true) {
                 return ac_mode_1.AcMode.Cooling;
             }
             return ac_mode_1.AcMode.Off;
@@ -135,7 +140,7 @@ class AcDevice {
         let threshold = acOn ? 0.5 : 1.5;
         let thresholdHeating = acOn ? 0.5 : 1.5;
         let desiredMode = ac_mode_1.AcMode.Off;
-        const excessEnergy = (_h = (_g = devices_1.Devices.energymanager) === null || _g === void 0 ? void 0 : _g.excessEnergy) !== null && _h !== void 0 ? _h : -1;
+        const excessEnergy = (_e = (_d = devices_1.Devices.energymanager) === null || _d === void 0 ? void 0 : _d.excessEnergy) !== null && _e !== void 0 ? _e : -1;
         if ((acOn ? 200 : 1000) < excessEnergy) {
             // As there is plenty of energy to spare we plan to overshoot the target by 1 degree
             threshold = -0.5;
@@ -146,7 +151,7 @@ class AcDevice {
         const heatUntil = targetTemp - thresholdHeating;
         if (temp > coolUntil && settings_service_1.SettingsService.heatMode === config_1.HeatingMode.Sommer) {
             desiredMode = ac_mode_1.AcMode.Cooling;
-            if (this.settings.noCoolingOnMovement && ((_k = (_j = this.room) === null || _j === void 0 ? void 0 : _j.PraesenzGroup) === null || _k === void 0 ? void 0 : _k.anyPresent()) === true) {
+            if (this.settings.noCoolingOnMovement && ((_g = (_f = this.room) === null || _f === void 0 ? void 0 : _f.PraesenzGroup) === null || _g === void 0 ? void 0 : _g.anyPresent()) === true) {
                 return ac_mode_1.AcMode.Off;
             }
         }
@@ -158,13 +163,6 @@ class AcDevice {
         }
         return desiredMode;
     }
-    /**
-     * Disable automatic Turn-On and Turn-Off for given amount of ms.
-     * @param {number} timeout
-     */
-    deactivateAutomaticChange(timeout = 60 * 60 * 1000) {
-        this.blockAutomationHandler.disableAutomatic(timeout);
-    }
     onTemperaturChange(newTemperatur) {
         this.roomTemperatur = newTemperatur;
     }
@@ -186,8 +184,9 @@ class AcDevice {
     turnOffDueToMissingEnergy() {
         this.turnOff();
     }
+    // TODO: Migrate to new command system
     setState(mode, desiredTemp, forceTime = 60 * 60 * 1000) {
-        this.blockAutomationHandler.disableAutomatic(forceTime);
+        this.blockAutomationHandler.disableAutomatic(new models_1.BlockAutomaticCommand(models_1.CommandSource.Unknown, forceTime));
         this._mode = mode;
         if (mode == ac_mode_1.AcMode.Off) {
             this.turnOff();

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

@@ -68,6 +68,7 @@ class DaikinService {
             });
         });
     }
+    // TODO: Migrate to new command system
     static setAll(on, force = false) {
         if (!this.isInitialized) {
             return;
@@ -81,7 +82,7 @@ class DaikinService {
                 dev.turnOff();
             }
             if (force) {
-                dev.deactivateAutomaticChange(180 * 60 * 1000);
+                dev.blockAutomationHandler.disableAutomatic(new models_1.BlockAutomaticCommand(models_1.CommandSource.Unknown, 180 * 60 * 1000));
             }
         }
     }

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

@@ -86,13 +86,21 @@ class OwnDaikinDevice extends ac_device_1.AcDevice {
         });
     }
     setDesiredInfo(retry = false, forceTemp) {
-        var _a;
+        var _a, _b;
+        if (this._desiredTemperatur === devices_1.UNDEFINED_TEMP_VALUE) {
+            if (((_a = this.room) === null || _a === void 0 ? void 0 : _a.HeatGroup) === undefined) {
+                this.log(models_1.LogLevel.Error, `Neither desired temperature nor HeatGroup is set for ${this.name}(${this.ip})`);
+                return;
+            }
+            this._desiredTemperatur = this.room.HeatGroup.desiredTemp;
+            return;
+        }
         let targetTemp = this._desiredTemperatur;
         if (this.desiredMode == daikin_controller_1.Mode.HOT) {
-            targetTemp = this.settings.useOwnTemperatureAndAutomatic ? targetTemp + 1 : 29;
+            targetTemp = this.settings.useOwnTemperature ? targetTemp : 29;
         }
         else if (this.desiredMode == daikin_controller_1.Mode.COLD) {
-            targetTemp = this.settings.useOwnTemperatureAndAutomatic ? targetTemp - 1 : 16;
+            targetTemp = this.settings.useOwnTemperature ? targetTemp : 16;
         }
         const changeObject = {
             power: this.desiredState,
@@ -100,7 +108,7 @@ class OwnDaikinDevice extends ac_device_1.AcDevice {
             targetHumidity: this.desiredHum,
             targetTemperature: forceTemp !== null && forceTemp !== void 0 ? forceTemp : targetTemp,
         };
-        (_a = this.device) === null || _a === void 0 ? void 0 : _a.setACControlInfo(changeObject, (err, res) => {
+        (_b = this.device) === null || _b === void 0 ? void 0 : _b.setACControlInfo(changeObject, (err, res) => {
             var _a;
             if (err !== null) {
                 log_service_1.ServerLogService.writeLog(models_1.LogLevel.Warn, `Setting Ac Info for ${this.name} failed:  ${err} `);

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

@@ -1,5 +1,5 @@
 import { BaseGroup, ButtonPosition, ButtonPressType, iBaseDevice } from '../../devices';
-import { CollisionSolving, DeviceSettings, RoomBase } from '../../../models';
+import { ActuatorSetStateCommand, BlockAutomaticCommand, BlockAutomaticLiftBlockCommand, CollisionSolving, DeviceSettings, DimmerSetLightCommand, LampSetLightCommand, LedSetLightCommand, RoomBase, ShutterSetLevelCommand } from '../../../models';
 import { LogObject } from '../log-service';
 import { AcDevice, AcMode } from '../ac';
 import { GroupSettings } from '../../../models/groupSettings/groupSettings';
@@ -40,14 +40,25 @@ export declare class API {
     static setAllAc(desiredState: boolean): void;
     /**
      * Changes the status of a given Lamp
+     * @deprecated Use "API.lampSetLight" instead
+     * TODO: Remove deprecated API method
      * @param {string} deviceId The device Id of the lamp
      * @param {boolean} state The desired new state
      * @param timeout Desired time after which this should be reverted to normal state
      * @returns {Error | null} In case it failed the Error containing the reason
      */
     static setLamp(deviceId: string, state: boolean, timeout?: number): Error | null;
+    /**
+     * Changes the status of a given Lamp
+     * @param {string} deviceId The device Id of the lamp
+     * @param {LampSetLightCommand} c The command(stack) to perform on the lamp
+     * @returns {Error | null} In case it failed the Error containing the reason.
+     */
+    static lampSetLight(deviceId: string, c: LampSetLightCommand): Error | null;
     /**
      * Changes the status of a given actuator
+     * @deprecated Use "API.actuatorSetState" instead
+     * TODO: Remove deprecated API method
      * @param {string} deviceId The device Id of the actuator
      * @param {boolean} state The desired new state
      * @param timeout Desired time after which this should be reverted to automatic state
@@ -57,6 +68,15 @@ export declare class API {
     /**
      * Changes the status of a given actuator
      * @param {string} deviceId The device Id of the actuator
+     * @param {ActuatorSetStateCommand} c The command(stack) to perform on the actuator
+     * @returns {Error | null} In case it failed the Error containing the reason
+     */
+    static actuatorSetState(deviceId: string, c: ActuatorSetStateCommand): Error | null;
+    /**
+     * Changes the status of the given dimmer
+     * @deprecated Use "API.dimmerSetLight" instead
+     * TODO: Remove deprecated API method
+     * @param {string} deviceId The device Id of the actuator
      * @param {boolean} state The desired new state
      * @param timeout A chosen Timeout after which the light should be reset
      * @param brightness The desired brightness
@@ -65,7 +85,16 @@ export declare class API {
      */
     static setDimmer(deviceId: string, state: boolean, timeout?: number, brightness?: number, transitionTime?: number): Error | null;
     /**
-     * Changes the status of a given actuator
+     * Changes the status of the given dimmer
+     * @param {string} deviceId The device Id of the dimmable device.
+     * @param {DimmerSetLightCommand} command The command(stack) to perform on the dimmer
+     * @returns {Error | null} In case it failed the Error containing the reason.
+     */
+    static dimmerSetLight(deviceId: string, command: DimmerSetLightCommand): Error | null;
+    /**
+     * Changes the status of a given led-device
+     * @deprecated Use "API.ledSetLight" instead
+     * TODO: Remove deprecated API method
      * @param {string} deviceId The device Id of the actuator
      * @param {boolean} state The desired new state
      * @param timeout A chosen Timeout after which the light should be reset
@@ -76,14 +105,30 @@ export declare class API {
      * @returns {Error | null} In case it failed the Error containing the reason
      */
     static setLedLamp(deviceId: string, state: boolean, timeout?: number, brightness?: number, transitionTime?: number, color?: string, colorTemp?: number): Error | null;
+    /**
+     * Changes the status of a given led-device
+     * @param {string} deviceId The device Id of the LED-Device
+     * @param {LedSetLightCommand} command The command(stack) to perform on the led-device
+     */
+    static ledSetLight(deviceId: string, command: LedSetLightCommand): Error | null;
     /**
      * Changes the position of a given shutter
      * if needed this updates the window position as well
+     * @deprecated Use "API.shutterSetLevel" instead
+     * TODO: Remove deprecated API method
      * @param {string} deviceId The device Id of the shutter
      * @param {number} level The desired new level (0 being open, 100 being closed)
      * @returns {Error | null} Error if there is no shutter with the given id
      */
     static setShutter(deviceId: string, level: number): Error | null;
+    /**
+     * Changes the position of a given shutter
+     * if needed this updates the window position as well
+     * @param {string} deviceId The device Id of the shutter
+     * @param {ShutterSetLevelCommand} command The command(stack) to perform on the shutter
+     * @returns {Error | null} Error if there is no shutter with the given id
+     */
+    static shutterSetLevel(deviceId: string, command: ShutterSetLevelCommand): Error | null;
     static speakOnDevice(deviceId: string, message: string, volume?: number): Error | null;
     /**
      * Starts a specified scene
@@ -113,17 +158,35 @@ export declare class API {
     static loadAllDeviceSettingsFromDb(): void;
     /**
      * Lifts a previously started Block of automatic
+     * @deprecated Use "API.blockAutomaticLiftAutomaticBlock" instead
+     * TODO: Remove deprecated API method
      * @param {string} deviceId The target device
      * @returns {Error | null} In case it failed the Error containing the reason
      */
     static liftAutomaticBlock(deviceId: string): Error | null;
+    /**
+     * Lifts a previously started Block of automatic
+     * @param {string} deviceId The target device
+     * @param {BlockAutomaticLiftBlockCommand} command The command to lift the automatic block
+     * @returns {Error | null} In case it failed the Error containing the reason
+     */
+    static blockAutomaticLiftAutomaticBlock(deviceId: string, command: BlockAutomaticLiftBlockCommand): Error | null;
     /**
      * Blocks the automatic of the given device for provided Duration
+     * @deprecated Use "API.blockAutomaticDisable" instead
+     * TODO: Remove deprecated API method
      * @param {string} deviceId The target device
      * @param {number} duration The duration in ms for which the device should remain in current state
      * @param {CollisionSolving} onCollision The desired Collision Solving strategy, in case the automatic being blocked already
      * @returns {Error | null} In case it failed the Error containing the reason
      */
     static blockAutomatic(deviceId: string, duration: number, onCollision?: CollisionSolving): Error | null;
+    /**
+     * Blocks the automatic of the given device for provided Duration
+     * @param {string} deviceId The target device
+     * @param {BlockAutomaticCommand} command The command to block the automatic
+     * @returns {Error | null} In case it failed the Error containing the reason
+     */
+    static blockAutomaticSetBlock(deviceId: string, command: BlockAutomaticCommand): Error | null;
     static pressButtonSwitch(deviceId: string, position: ButtonPosition, pressType: ButtonPressType): Error | null;
 }