hoffmation-base 3.0.0-beta.0 → 3.0.0-beta.10

package/README.md

@@ -1,34 +1,60 @@
 # Hoffmation-Base
+
 [![DeepSource](https://deepsource.io/gh/theimo1221/Hoffmation-Base.svg/?label=active+issues&show_trend=true&token=Ec4T7omgYOMMc4ezxv_9bHk9)](https://deepsource.io/gh/theimo1221/Hoffmation-Base/?ref=repository-badge)
 
 A home automation library specialized for Zigbee and Homematic IP devices in combination with ioBroker.
+
 ## What does it do?
-This project serves as library for home automation projects. It provides services, models and utilities necessary to interact with rooms and smart devices via iobroker, but also to connect them to other services for textual/audio/visual notifications or really just any code or service you want the devices to connect to.
 
-Built on other open source projects that take care of the technical level, this project is made to provide a tool for the coding on the logical level. It is built as base to write automation code independent of the ioBroker user interface and currently provides support for the interaction with **devices** specified in [`src/server/devices`](src/server/devices) and **services** that can be found in [`src/server/services`](src/server/devices).
+This project serves as library for home automation projects. It provides services, models and utilities necessary to
+interact with rooms and smart devices via iobroker, but also to connect them to other services for textual/audio/visual
+notifications or really just any code or service you want the devices to connect to.
+
+Built on other open source projects that take care of the technical level, this project is made to provide a tool for
+the coding on the logical level. It is built as base to write automation code independent of the ioBroker user interface
+and currently provides support for the interaction with **devices** specified in [
+`src/server/devices`](src/server/devices) and **services** that can be found in [
+`src/server/services`](src/server/devices).
 
 Those include, but are not limited to:
 
-- **Devices**: Motion/Presence sensors, window handles, heating elements, lamps and dimmers, shutters, door contact sensors, physical buttons/switches, power sockets
+- **Devices**: Motion/Presence sensors, window handles, heating elements, lamps and dimmers, shutters, door contact
+  sensors, physical buttons/switches, power sockets
 - **Services**: Interaction service for a telegram bot, weather, sonos control, waste calendar
 
+## Ecosystem Overview
+
+![Hoffmation.drawio.png](./Hoffmation.drawio.png)
+
 ## How can I use it?
-This library *can* be used in conjunction with or as addition to own base projects, but it's intended to be used with the configuration project [Hoffmation-Express](https://github.com/theimo1221/Hoffmation-Express) which uses this library via a [npm package](https://www.npmjs.com/package/hoffmation-base).
 
-Whether you use it with Hoffmation-Express or with your own controller code, make sure you pass a valid config file (see [`src/server/config/private`](src/server/config/private) for an example) and a valid ioBroker device tree (you can find more information about that in the Hoffmation-Express project).
+This library *can* be used in conjunction with or as addition to own base projects, but it's intended to be used with
+the configuration project [Hoffmation-Express](https://github.com/theimo1221/Hoffmation-Express) which uses this library
+via a [npm package](https://www.npmjs.com/package/hoffmation-base).
+
+Whether you use it with Hoffmation-Express or with your own controller code, make sure you pass a valid config file (
+see [`src/server/config/private`](src/server/config/private) for an example) and a valid ioBroker device tree (you can
+find more information about that in the Hoffmation-Express project).
 
 ### Base requirements
+
 In order to get the library running correctly, the following requirements should be met:
+
 * You use ioBroker for all devices that you want to control or read from
   Make sure you got the [socket.io](https://github.com/ioBroker/ioBroker.socketio) adapter installed
 * You use devices that are supported or are able to use one of the supported devices as base for yours.  
-  (If you use a Zigbee or Homematic IP device that is not currently supported, don't hesitate to create a pull request and add it!)
+  (If you use a Zigbee or Homematic IP device that is not currently supported, don't hesitate to create a pull request
+  and add it!)
 * You have a unix-based or windows device for the software you want to run this library with.
 
 ### Build
+
 To build the library, make sure [Node.js](https://nodejs.org/en/download/) is installed.  
 Then, just run `npm run build`.
 
 ## Why would I use it?
-Even if it looks simple at first, automating your entire home with a user interface can sometimes be more difficult than just *coding* your home.  
-Especially if you have a lot of specialized requirements that you want to satisfy, it can be simpler to just code your own rules and interfaces than to rely on user interfaces to do it for you.  
+
+Even if it looks simple at first, automating your entire home with a user interface can sometimes be more difficult than
+just *coding* your home.  
+Especially if you have a lot of specialized requirements that you want to satisfy, it can be simpler to just code your
+own rules and interfaces than to rely on user interfaces to do it for you.  

package/lib/models/action/handleChangeAction.d.ts

@@ -0,0 +1,12 @@
+import { BaseAction } from './baseAction';
+import { CommandType } from '../command';
+import { iHandleSensor } from '../../server';
+export declare class HandleChangeAction extends BaseAction {
+    /** @inheritDoc */
+    type: CommandType;
+    /**
+     * The window-handle that triggered the action
+     */
+    readonly handle: iHandleSensor;
+    constructor(handle: iHandleSensor);
+}

package/lib/models/action/handleChangeAction.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HandleChangeAction = void 0;
+const baseAction_1 = require("./baseAction");
+const command_1 = require("../command");
+const server_1 = require("../../server");
+class HandleChangeAction extends baseAction_1.BaseAction {
+    constructor(handle) {
+        super(undefined, `${handle.customName} ${handle.position === server_1.WindowPosition.closed ? 'opened' : 'closed'}`);
+        /** @inheritDoc */
+        this.type = command_1.CommandType.HandleChangedAction;
+        this.handle = handle;
+    }
+}
+exports.HandleChangeAction = HandleChangeAction;

package/lib/models/action/index.d.ts

@@ -8,3 +8,4 @@ export * from './temperatureSensorChangeAction';
 export { ActuatorChangeAction } from './actuatorChangeAction';
 export { BatteryLevelChangeAction } from './batteryLevelChangeAction';
 export { PresenceGroupAnyMovementAction } from './presenceGroupAnyMovementAction';
+export { HandleChangeAction } from './handleChangeAction';

package/lib/models/action/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PresenceGroupAnyMovementAction = exports.BatteryLevelChangeAction = exports.ActuatorChangeAction = exports.BaseAction = void 0;
+exports.HandleChangeAction = exports.PresenceGroupAnyMovementAction = exports.BatteryLevelChangeAction = exports.ActuatorChangeAction = exports.BaseAction = void 0;
 var baseAction_1 = require("./baseAction");
 Object.defineProperty(exports, "BaseAction", { enumerable: true, get: function () { return baseAction_1.BaseAction; } });
 __exportStar(require("./humiditySensorChangeAction"), exports);
@@ -29,3 +29,5 @@ var batteryLevelChangeAction_1 = require("./batteryLevelChangeAction");
 Object.defineProperty(exports, "BatteryLevelChangeAction", { enumerable: true, get: function () { return batteryLevelChangeAction_1.BatteryLevelChangeAction; } });
 var presenceGroupAnyMovementAction_1 = require("./presenceGroupAnyMovementAction");
 Object.defineProperty(exports, "PresenceGroupAnyMovementAction", { enumerable: true, get: function () { return presenceGroupAnyMovementAction_1.PresenceGroupAnyMovementAction; } });
+var handleChangeAction_1 = require("./handleChangeAction");
+Object.defineProperty(exports, "HandleChangeAction", { enumerable: true, get: function () { return handleChangeAction_1.HandleChangeAction; } });

package/lib/models/command/commandType.d.ts

@@ -28,6 +28,7 @@ export declare enum CommandType {
     ShutterSunriseUpCommand = "ShutterSunriseUpCommand",
     SunsetDownCommand = "SunsetDownCommand",
     TemperatureSensorChangeAction = "TemperatureSensorChangeAction",
+    HandleChangedAction = "HandleChangedAction",
     WindowRestoreDesiredPositionCommand = "WindowRestoreDesiredPositionCommand",
     WindowSetDesiredPositionCommand = "WindowSetDesiredPositionCommand",
     WindowSetRolloByWeatherStatusCommand = "WindowSetRolloByWeatherStatusCommand",

package/lib/models/command/commandType.js

@@ -32,6 +32,7 @@ var CommandType;
     CommandType["ShutterSunriseUpCommand"] = "ShutterSunriseUpCommand";
     CommandType["SunsetDownCommand"] = "SunsetDownCommand";
     CommandType["TemperatureSensorChangeAction"] = "TemperatureSensorChangeAction";
+    CommandType["HandleChangedAction"] = "HandleChangedAction";
     CommandType["WindowRestoreDesiredPositionCommand"] = "WindowRestoreDesiredPositionCommand";
     CommandType["WindowSetDesiredPositionCommand"] = "WindowSetDesiredPositionCommand";
     CommandType["WindowSetRolloByWeatherStatusCommand"] = "WindowSetRolloByWeatherStatusCommand";

package/lib/models/deviceSettings/dachsSettings.d.ts

@@ -37,6 +37,14 @@ export declare class DachsDeviceSettings extends ActuatorSettings {
      * Defines the desired minimum temperature for warm water.
      */
     warmWaterDesiredMinTemp: number;
+    /**
+     * Defines the desired minimum temperature for heat storage during winter.
+     */
+    winterMinimumHeatStorageTemp: number;
+    /**
+     * Defines the desired minimum temperature for heat storage during winter.
+     */
+    winterMinimumPreNightHeatStorageTemp: number;
     fromPartialObject(data: Partial<DachsDeviceSettings>): void;
     protected toJSON(): Partial<DachsDeviceSettings>;
 }

package/lib/models/deviceSettings/dachsSettings.js

@@ -43,9 +43,17 @@ class DachsDeviceSettings extends actuatorSettings_1.ActuatorSettings {
          * Defines the desired minimum temperature for warm water.
          */
         this.warmWaterDesiredMinTemp = 45;
+        /**
+         * Defines the desired minimum temperature for heat storage during winter.
+         */
+        this.winterMinimumHeatStorageTemp = 55;
+        /**
+         * Defines the desired minimum temperature for heat storage during winter.
+         */
+        this.winterMinimumPreNightHeatStorageTemp = 65;
     }
     fromPartialObject(data) {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         this.refreshIntervalTime = (_a = data.refreshIntervalTime) !== null && _a !== void 0 ? _a : this.refreshIntervalTime;
         this.batteryLevelBeforeNightTurnOnThreshold =
             (_b = data.batteryLevelBeforeNightTurnOnThreshold) !== null && _b !== void 0 ? _b : this.batteryLevelBeforeNightTurnOnThreshold;
@@ -55,6 +63,9 @@ class DachsDeviceSettings extends actuatorSettings_1.ActuatorSettings {
             (_e = data.batteryLevelPreventStartThreshold) !== null && _e !== void 0 ? _e : this.batteryLevelPreventStartThreshold;
         this.batteryLevelAllowStartThreshold = (_f = data.batteryLevelAllowStartThreshold) !== null && _f !== void 0 ? _f : this.batteryLevelAllowStartThreshold;
         this.warmWaterDesiredMinTemp = (_g = data.warmWaterDesiredMinTemp) !== null && _g !== void 0 ? _g : this.warmWaterDesiredMinTemp;
+        this.winterMinimumHeatStorageTemp = (_h = data.winterMinimumHeatStorageTemp) !== null && _h !== void 0 ? _h : this.winterMinimumHeatStorageTemp;
+        this.winterMinimumPreNightHeatStorageTemp =
+            (_j = data.winterMinimumPreNightHeatStorageTemp) !== null && _j !== void 0 ? _j : this.winterMinimumPreNightHeatStorageTemp;
         super.fromPartialObject(data);
     }
     toJSON() {

package/lib/models/deviceSettings/heaterSettings.d.ts

@@ -10,6 +10,10 @@ export declare class HeaterSettings extends DeviceSettings {
      * @default true
      */
     useOwnTemperatur: boolean;
+    /**
+     * Whether this devices temperature measurement should be included in the room temperature calculation.
+     */
+    useOwnTemperatureForRoomTemperature: boolean;
     /**
      * Whether this device should be controlled using only valve position
      * @default false

package/lib/models/deviceSettings/heaterSettings.js

@@ -16,6 +16,10 @@ class HeaterSettings extends deviceSettings_1.DeviceSettings {
          * @default true
          */
         this.useOwnTemperatur = true;
+        /**
+         * Whether this devices temperature measurement should be included in the room temperature calculation.
+         */
+        this.useOwnTemperatureForRoomTemperature = true;
         /**
          * Whether this device should be controlled using only valve position
          * @default false
@@ -55,16 +59,18 @@ class HeaterSettings extends deviceSettings_1.DeviceSettings {
         this.manualDisabled = false;
     }
     fromPartialObject(data) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         this.automaticMode = (_a = data.automaticMode) !== null && _a !== void 0 ? _a : this.automaticMode;
         this.useOwnTemperatur = (_b = data.useOwnTemperatur) !== null && _b !== void 0 ? _b : this.useOwnTemperatur;
-        this.controlByPid = (_c = data.controlByPid) !== null && _c !== void 0 ? _c : this.controlByPid;
-        this.controlByTempDiff = (_d = data.controlByTempDiff) !== null && _d !== void 0 ? _d : this.controlByTempDiff;
-        this.seasonalTurnOffActive = (_e = data.seasonalTurnOffActive) !== null && _e !== void 0 ? _e : this.seasonalTurnOffActive;
-        this.seasonTurnOffDay = (_f = data.seasonTurnOffDay) !== null && _f !== void 0 ? _f : this.seasonTurnOffDay;
-        this.seasonTurnOnDay = (_g = data.seasonTurnOnDay) !== null && _g !== void 0 ? _g : this.seasonTurnOnDay;
-        this.pidForcedMinimum = (_h = data.pidForcedMinimum) !== null && _h !== void 0 ? _h : this.pidForcedMinimum;
-        this.manualDisabled = (_j = data.manualDisabled) !== null && _j !== void 0 ? _j : this.manualDisabled;
+        this.useOwnTemperatureForRoomTemperature =
+            (_c = data.useOwnTemperatureForRoomTemperature) !== null && _c !== void 0 ? _c : this.useOwnTemperatureForRoomTemperature;
+        this.controlByPid = (_d = data.controlByPid) !== null && _d !== void 0 ? _d : this.controlByPid;
+        this.controlByTempDiff = (_e = data.controlByTempDiff) !== null && _e !== void 0 ? _e : this.controlByTempDiff;
+        this.seasonalTurnOffActive = (_f = data.seasonalTurnOffActive) !== null && _f !== void 0 ? _f : this.seasonalTurnOffActive;
+        this.seasonTurnOffDay = (_g = data.seasonTurnOffDay) !== null && _g !== void 0 ? _g : this.seasonTurnOffDay;
+        this.seasonTurnOnDay = (_h = data.seasonTurnOnDay) !== null && _h !== void 0 ? _h : this.seasonTurnOnDay;
+        this.pidForcedMinimum = (_j = data.pidForcedMinimum) !== null && _j !== void 0 ? _j : this.pidForcedMinimum;
+        this.manualDisabled = (_k = data.manualDisabled) !== null && _k !== void 0 ? _k : this.manualDisabled;
         super.fromPartialObject(data);
     }
     toJSON() {

package/lib/server/devices/baseDeviceInterfaces/iHandleSensor.d.ts

@@ -2,6 +2,7 @@ import { WindowPosition } from '../models';
 import { iRoomDevice } from './iRoomDevice';
 import { HandleSensor } from '../sharedFunctions';
 import { Window } from '../groups';
+import { HandleChangeAction } from '../../../models';
 /**
  * Interface for Handle Sensors.
  * A handle sensor can be any device that is capable of detecting the position of a window handle e.g. a sensor, a window handle, etc.
@@ -40,4 +41,9 @@ export interface iHandleSensor extends iRoomDevice {
      * @param pCallback - The callback to fire
      */
     addClosedCallback(pCallback: (pValue: boolean) => void): void;
+    /**
+     * Add a callback that is called when the handle is changed to any position
+     * @param cb - The callback to fire
+     */
+    addHandleChangeCallback(cb: (handleChangeAction: HandleChangeAction) => void): void;
 }

package/lib/server/devices/baseDeviceInterfaces/iHeater.d.ts

@@ -1,12 +1,13 @@
-import { HeaterSettings } from '../../../models';
+import { HandleChangeAction, HeaterSettings } from '../../../models';
 import { iRoomDevice } from './iRoomDevice';
 import { iDisposable } from '../../services';
+import { iTemperatureSensor } from './iTemperatureSensor';
 /**
  * This interface represents a heater device.
  *
  * For devices with {@link DeviceCapability.heater} capability.
  */
-export interface iHeater extends iRoomDevice, iDisposable {
+export interface iHeater extends iTemperatureSensor, iRoomDevice, iDisposable {
     /**
      * The settings of the heater
      */
@@ -19,14 +20,6 @@ export interface iHeater extends iRoomDevice, iDisposable {
      * The current valve position of the heater (between 0 and 1.0)
      */
     readonly iLevel: number;
-    /**
-     * The current temperature in degree Celsius of the heater
-     */
-    readonly iTemperature: number;
-    /**
-     * The current room temperature in degree Celsius
-     */
-    readonly roomTemperature: number;
     /**
      * The interval to persist the heater information
      * This mainly enforces the interval to be implemented.
@@ -37,16 +30,20 @@ export interface iHeater extends iRoomDevice, iDisposable {
      */
     seasonTurnOff: boolean;
     /**
-     * Perform a check to calculate the new desired heater state
+     * Whether any window in the room is open.
      */
-    checkAutomaticChange(): void;
+    readonly windowOpen: boolean;
     /**
-     * Informs the heater that the temperature of the room has changed
-     * @param newTemperatur - The new temperature in degree Celsius.
+     * Perform a check to calculate the new desired heater state
      */
-    onTemperaturChange(newTemperatur: number): void;
+    checkAutomaticChange(): void;
     /**
      * Persists the current heater information to the database
      */
     persistHeater(): void;
+    /**
+     * Called when a window handle in the room changes its state
+     * @param action
+     */
+    onHandleChange(action: HandleChangeAction): void;
 }

package/lib/server/devices/baseDeviceInterfaces/index.d.ts

@@ -4,6 +4,7 @@ export * from './iBaseDevice';
 export * from './iBatteryDevice';
 export * from './iButtonSwitch';
 export * from './iCameraDevice';
+export * from './iDimmableLamp';
 export * from './iEnergyManager';
 export * from './iExcessEnergyConsumer';
 export * from './iGarageDoorOpener';

package/lib/server/devices/baseDeviceInterfaces/index.js

@@ -20,6 +20,7 @@ __exportStar(require("./iBaseDevice"), exports);
 __exportStar(require("./iBatteryDevice"), exports);
 __exportStar(require("./iButtonSwitch"), exports);
 __exportStar(require("./iCameraDevice"), exports);
+__exportStar(require("./iDimmableLamp"), exports);
 __exportStar(require("./iEnergyManager"), exports);
 __exportStar(require("./iExcessEnergyConsumer"), exports);
 __exportStar(require("./iGarageDoorOpener"), exports);

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

@@ -87,7 +87,9 @@ export declare class Dachs implements iBaseDevice, iActuator {
      */
     private onBatteryLevelChange;
     private checkAllDesiredStates;
-    private onTempChange;
+    private onHeatStorageTempChange;
+    private onWarmWaterTempChange;
+    private checkWwPumpDesiredState;
     private checkHeatingRod;
     private shouldDachsBeStarted;
     private checkAlternativeActuator;

package/lib/server/devices/dachs/dachs.js

@@ -63,8 +63,8 @@ class Dachs {
             const energyManager = devices_1.Devices.energymanager;
             energyManager.battery.addBatteryLevelCallback(this.onBatteryLevelChange.bind(this));
         }
-        this.warmWaterSensor.addTempChangeCallback(this.onTempChange.bind(this));
-        this.heatStorageTempSensor.addTempChangeCallback(this.onTempChange.bind(this));
+        this.warmWaterSensor.addTempChangeCallback(this.onWarmWaterTempChange.bind(this));
+        this.heatStorageTempSensor.addTempChangeCallback(this.onHeatStorageTempChange.bind(this));
     }
     /** @inheritDoc */
     get info() {
@@ -220,6 +220,7 @@ class Dachs {
         const shouldDachsBeStarted = this.shouldDachsBeStarted(action, batteryLevel);
         this.checkHeatingRod(action, batteryLevel);
         this.checkAlternativeActuator(shouldDachsBeStarted, action);
+        this.checkWwPumpDesiredState(action);
         if (!shouldDachsBeStarted) {
             return;
         }
@@ -227,7 +228,15 @@ class Dachs {
         setStateCommand.overrideCommandSource = models_1.CommandSource.Force;
         this.setActuator(setStateCommand);
     }
-    onTempChange(action) {
+    onHeatStorageTempChange(action) {
+        var _a, _b;
+        this.checkAllDesiredStates(action, (_b = (_a = devices_1.Devices.energymanager) === null || _a === void 0 ? void 0 : _a.batteryLevel) !== null && _b !== void 0 ? _b : 0);
+    }
+    onWarmWaterTempChange(action) {
+        var _a, _b;
+        this.checkAllDesiredStates(action, (_b = (_a = devices_1.Devices.energymanager) === null || _a === void 0 ? void 0 : _a.batteryLevel) !== null && _b !== void 0 ? _b : 0);
+    }
+    checkWwPumpDesiredState(action) {
         var _a, _b;
         if (this.warmWaterPump === undefined) {
             // We have no control over the warm water pump --> nothing to do
@@ -288,7 +297,7 @@ class Dachs {
         this.heatingRod.setActuator(setAction);
     }
     shouldDachsBeStarted(action, batteryLevel) {
-        var _a;
+        var _a, _b;
         if (this.blockDachsStart !== undefined) {
             if (batteryLevel > this.settings.batteryLevelPreventStartThreshold) {
                 const blockAction = new models_1.ActuatorSetStateCommand(action, true, `Battery reached ${batteryLevel}%, Dachs should not run any more`, null);
@@ -301,7 +310,7 @@ class Dachs {
                 this.blockDachsStart.setActuator(liftAction);
             }
             else if (((_a = services_1.SettingsService.settings.heaterSettings) === null || _a === void 0 ? void 0 : _a.mode) === config_1.HeatingMode.Winter &&
-                this.heatStorageTempSensor.temperatureSensor.temperature < 60 &&
+                this.heatStorageTempSensor.temperatureSensor.temperature < this.settings.winterMinimumPreNightHeatStorageTemp &&
                 services_1.Utils.dateByTimeSpan(21, 30) < new Date()) {
                 const liftWinterAction = new models_1.ActuatorSetStateCommand(action, false, `Battery at ${batteryLevel}% but it is winter, we are nearing night and heat storage is kinda cold: Dachs is now allowed to run if needed`, null);
                 this.blockDachsStart.setActuator(liftWinterAction);
@@ -315,6 +324,11 @@ class Dachs {
             // We are already running
             return false;
         }
+        if (((_b = services_1.SettingsService.settings.heaterSettings) === null || _b === void 0 ? void 0 : _b.mode) === config_1.HeatingMode.Winter &&
+            this.heatStorageTempSensor.temperatureSensor.temperature < this.settings.winterMinimumHeatStorageTemp) {
+            // It is winter and heat storage is kinda cold --> Start
+            return true;
+        }
         const dayType = services_1.TimeCallbackService.dayType(new services_1.SunTimeOffsets());
         if ((dayType === models_1.TimeOfDay.Daylight || dayType === models_1.TimeOfDay.BeforeSunrise) &&
             batteryLevel > this.settings.batteryLevelTurnOnThreshold) {

package/lib/server/devices/dachs/lib/dachsHttpClient.js

@@ -33,6 +33,8 @@ const _ = __importStar(require("lodash"));
 const keyTemplates_1 = __importDefault(require("./keyTemplates"));
 const services_1 = require("../../../services");
 const models_1 = require("../../../../models");
+const http = __importStar(require("node:http"));
+const https = __importStar(require("node:https"));
 /**
  * axios HTTP Client Class
  * - with some prepared fetch functions for data
@@ -47,6 +49,8 @@ class DachsHttpClient {
         this.options = options;
         //combine parameter to baseUrl
         //check http prefix
+        axios_1.default.defaults.httpsAgent = new https.Agent({ keepAlive: false });
+        axios_1.default.defaults.httpAgent = new http.Agent({ keepAlive: false });
         const protocol = options.protocol ? options.protocol : 'http';
         this.options.host = this.options.host.startsWith('http') ? this.options.host : `${protocol}://${this.options.host}`;
         //combine all parameter for url

package/lib/server/devices/device-cluster.js

@@ -65,6 +65,11 @@ class DeviceCluster {
             case deviceType_1.DeviceType.HmIpGriff:
                 clusterTypes.push(device_cluster_type_1.DeviceClusterType.Handle);
                 break;
+            case deviceType_1.DeviceType.ZigbeeSodaHandle:
+                clusterTypes.push(device_cluster_type_1.DeviceClusterType.Handle);
+                clusterTypes.push(device_cluster_type_1.DeviceClusterType.TemperaturSensor);
+                clusterTypes.push(device_cluster_type_1.DeviceClusterType.HumiditySensor);
+                break;
             case deviceType_1.DeviceType.HmIpHeizgruppe:
                 clusterTypes.push(device_cluster_type_1.DeviceClusterType.Heater);
                 clusterTypes.push(device_cluster_type_1.DeviceClusterType.TemperaturSensor);
@@ -78,6 +83,7 @@ class DeviceCluster {
             case deviceType_1.DeviceType.HmIpBewegung:
             case deviceType_1.DeviceType.ZigbeeAquaraMotion:
             case deviceType_1.DeviceType.ZigbeeSonoffMotion:
+            case deviceType_1.DeviceType.ZigbeeTuyaMotion:
             case deviceType_1.DeviceType.HmIpPraezenz:
                 clusterTypes.push(device_cluster_type_1.DeviceClusterType.MotionDetection);
                 break;

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

@@ -39,6 +39,7 @@ export declare enum DeviceType {
     ZigbeeUbisysLampe = 225,
     ZigbeeInnr142C = 226,
     ZigbeeSodaHandle = 227,
+    ZigbeeTuyaMotion = 228,
     JsEnergyManager = 301,
     RoomScene = 401,
     ShellyTrv = 402,

package/lib/server/devices/deviceType.js

@@ -43,6 +43,7 @@ var DeviceType;
     DeviceType[DeviceType["ZigbeeUbisysLampe"] = 225] = "ZigbeeUbisysLampe";
     DeviceType[DeviceType["ZigbeeInnr142C"] = 226] = "ZigbeeInnr142C";
     DeviceType[DeviceType["ZigbeeSodaHandle"] = 227] = "ZigbeeSodaHandle";
+    DeviceType[DeviceType["ZigbeeTuyaMotion"] = 228] = "ZigbeeTuyaMotion";
     DeviceType[DeviceType["JsEnergyManager"] = 301] = "JsEnergyManager";
     DeviceType[DeviceType["RoomScene"] = 401] = "RoomScene";
     DeviceType[DeviceType["ShellyTrv"] = 402] = "ShellyTrv";

package/lib/server/devices/devices.js

@@ -223,6 +223,9 @@ class Devices {
             case 'TuyaValve':
                 d = new zigbee_1.ZigbeeTuyaValve(zigbeeInfo);
                 break;
+            case 'TuyaMotion':
+                d = new zigbee_1.ZigbeeTuyaMotion(zigbeeInfo);
+                break;
             case 'EuroHeater':
                 d = new zigbee_1.ZigbeeEuroHeater(zigbeeInfo);
                 break;

package/lib/server/devices/groups/Window.d.ts

@@ -1,5 +1,5 @@
 import { WindowPosition } from '../models';
-import { ShutterPositionChangedAction, WindowRestoreDesiredPositionCommand, WindowSetDesiredPositionCommand } from '../../../models';
+import { HandleChangeAction, ShutterPositionChangedAction, WindowRestoreDesiredPositionCommand, WindowSetDesiredPositionCommand } from '../../../models';
 import { iHandleSensor, iShutter, iVibrationSensor } from '../baseDeviceInterfaces';
 import { BaseGroup } from './base-group';
 import { ZigbeeMagnetContact } from '../zigbee';
@@ -19,6 +19,11 @@ export declare class Window extends BaseGroup {
      * @returns {boolean} true if any shutter is down
      */
     get anyShutterDown(): boolean;
+    /**
+     * Checks if any handle is not closed
+     * @returns {boolean} true if any handle is not closed
+     */
+    get anyHandleNotClosed(): boolean;
     constructor(roomName: string, handleIds?: string[], vibrationIds?: string[], shutterIds?: string[], magnetIds?: string[]);
     /**
      * sets the desired Pos and moves rollo to this level
@@ -33,4 +38,5 @@ export declare class Window extends BaseGroup {
     initialize(): void;
     rolloPositionChange(action: ShutterPositionChangedAction): void;
     restoreDesiredPosition(c: WindowRestoreDesiredPositionCommand): void;
+    addHandleChangeCallback(cb: (handleChangeAction: HandleChangeAction) => void): void;
 }

package/lib/server/devices/groups/Window.js

@@ -25,6 +25,15 @@ class Window extends base_group_1.BaseGroup {
             return s.currentLevel === 0;
         });
     }
+    /**
+     * Checks if any handle is not closed
+     * @returns {boolean} true if any handle is not closed
+     */
+    get anyHandleNotClosed() {
+        return this.getHandle().some((h) => {
+            return h.position !== models_1.WindowPosition.closed;
+        });
+    }
     constructor(roomName, handleIds = [], vibrationIds = [], shutterIds = [], magnetIds = []) {
         super(roomName, group_type_1.GroupType.Window);
         this.handleIds = handleIds;
@@ -46,7 +55,7 @@ class Window extends base_group_1.BaseGroup {
         this.restoreDesiredPosition(new models_2.WindowRestoreDesiredPositionCommand(c));
     }
     getHandle() {
-        return this.deviceCluster.getIoBrokerDevicesByType(device_cluster_type_1.DeviceClusterType.Handle);
+        return this.deviceCluster.getDevicesByType(device_cluster_type_1.DeviceClusterType.Handle);
     }
     getMagnetContact() {
         return this.deviceCluster.getIoBrokerDevicesByType(device_cluster_type_1.DeviceClusterType.MagnetContact);
@@ -122,5 +131,10 @@ class Window extends base_group_1.BaseGroup {
     restoreDesiredPosition(c) {
         services_1.ShutterService.windowAllToPosition(this, new models_2.ShutterSetLevelCommand(c, this._desiredPosition));
     }
+    addHandleChangeCallback(cb) {
+        this.getHandle().forEach((griff) => {
+            griff.addHandleChangeCallback(cb);
+        });
+    }
 }
 exports.Window = Window;

package/lib/server/devices/groups/heatGroup.js

@@ -47,8 +47,13 @@ class HeatGroup extends base_group_1.BaseGroup {
     get temperature() {
         let temp = baseDeviceInterfaces_1.UNDEFINED_TEMP_VALUE;
         let count = 0;
-        this.getTempSensors().forEach((sensor) => {
-            const sensorValue = sensor.iTemperature;
+        const usedIds = [];
+        this.getHeater().forEach((heaterAsSensor) => {
+            usedIds.push(heaterAsSensor.id);
+            if (!heaterAsSensor.settings.useOwnTemperatureForRoomTemperature) {
+                return;
+            }
+            const sensorValue = heaterAsSensor.iTemperature;
             if (sensorValue === baseDeviceInterfaces_1.UNDEFINED_TEMP_VALUE) {
                 return;
             }
@@ -59,11 +64,12 @@ class HeatGroup extends base_group_1.BaseGroup {
             }
             temp = (temp * count + sensorValue) / ++count;
         });
-        this.getHeater().forEach((heaterAsSensor) => {
-            if (!heaterAsSensor.settings.useOwnTemperatur) {
+        this.getTempSensors().forEach((sensor) => {
+            if (usedIds.includes(sensor.id)) {
+                // Heater which correctly implement sensor as well.
                 return;
             }
-            const sensorValue = heaterAsSensor.iTemperature;
+            const sensorValue = sensor.iTemperature;
             if (sensorValue === baseDeviceInterfaces_1.UNDEFINED_TEMP_VALUE) {
                 return;
             }
@@ -114,6 +120,7 @@ class HeatGroup extends base_group_1.BaseGroup {
         return this.deviceCluster.getDevicesByType(device_cluster_type_1.DeviceClusterType.Ac);
     }
     initialize() {
+        var _a;
         services_1.Utils.guardedTimeout(() => {
             this.settings.initializeFromDb(this);
         }, 200, this);
@@ -125,6 +132,11 @@ class HeatGroup extends base_group_1.BaseGroup {
         this.getOwnAcDevices().forEach((acDev) => {
             acDev.room = this.getRoom();
         });
+        (_a = this.getRoom().WindowGroup) === null || _a === void 0 ? void 0 : _a.addHandleChangeCallback((handleChangeAction) => {
+            this.getHeater().forEach((heater) => {
+                heater.onHandleChange(handleChangeAction);
+            });
+        });
     }
     /**
      * Sets all ACs to new desired Value
@@ -155,10 +167,15 @@ class HeatGroup extends base_group_1.BaseGroup {
         if (temp == baseDeviceInterfaces_1.UNDEFINED_TEMP_VALUE) {
             return;
         }
+        const usedIds = [];
         this.getHeater().forEach((heater) => {
+            usedIds.push(heater.id);
             heater.onTemperaturChange(temp);
         });
         this.getTempSensors().forEach((sensor) => {
+            if (usedIds.includes(sensor.id)) {
+                return;
+            }
             sensor.onTemperaturChange(temp);
         });
         this.getOwnAcDevices().forEach((ac) => {

package/lib/server/devices/groups/windowGroup.d.ts

@@ -1,4 +1,4 @@
-import { RoomRestoreShutterPositionCommand, ShutterSunriseUpCommand, TimeCallback, WindowSetDesiredPositionCommand, WindowSetRolloByWeatherStatusCommand } from '../../../models';
+import { HandleChangeAction, RoomRestoreShutterPositionCommand, ShutterSunriseUpCommand, TimeCallback, WindowSetDesiredPositionCommand, WindowSetRolloByWeatherStatusCommand } from '../../../models';
 import { Window } from './Window';
 import { BaseGroup } from './base-group';
 export declare class WindowGroup extends BaseGroup {
@@ -20,7 +20,17 @@ export declare class WindowGroup extends BaseGroup {
      * @returns {boolean} True if there is atleast one shutte with level of 0%.
      */
     get anyShutterDown(): boolean;
+    /**
+     * Checks if any handle of any window is open
+     * @returns {boolean} True if there is atleast one handle that is open.
+     */
+    get anyWindowOpen(): boolean;
     constructor(roomName: string, windows: Window[]);
+    /**
+     * Adds Callbacks to each window and their handles.
+     * @param cb - The callback to execute on met condition.
+     */
+    addHandleChangeCallback(cb: (handleChangeAction: HandleChangeAction) => void): void;
     setDesiredPosition(c: WindowSetDesiredPositionCommand): void;
     initialize(): void;
     recalcTimeCallbacks(): void;