hoffmation-base 3.0.0-alpha.74 → 3.0.0-alpha.76

package/lib/models/base64Image.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 export declare class Base64Image {
     data: string;
     name: string;

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

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { HeaterSettings } from '../../../models';
 import { iRoomDevice } from './iRoomDevice';
 import { iDisposable } from '../../services';

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

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { iRoomDevice } from './iRoomDevice';
 import { HumiditySensorChangeAction } from '../../../models';
 export declare const UNDEFINED_HUMIDITY_VALUE = -1;

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

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { iRoomDevice } from './index';
 import { SceneSettings } from '../../../models';
 /**

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

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { iRoomDevice } from './iRoomDevice';
 import { TemperatureSensorChangeAction } from '../../../models';
 export declare const UNDEFINED_TEMP_VALUE = -99;

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

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { iTemperatureSensor } from '../baseDeviceInterfaces';
 import { LogDebugType, OwnSonosDevice } from '../../services';
 import { DeviceCapability } from '../DeviceCapability';

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

@@ -11,10 +11,10 @@ export declare class PresenceGroup extends BaseGroup {
     private get lastLeftDelayActive();
     getMotionDetector(): Array<iMotionSensor>;
     initCallbacks(): void;
-    presentAmount(): number;
+    anyPresent(includeMovementResetDelayCheck?: boolean): boolean;
     addLastLeftCallback(cb: (action: PresenceGroupLastLeftAction) => void): void;
     addAnyMovementCallback(cb: (action: PresenceGroupAnyMovementAction) => void): void;
-    anyPresent(includeMovementResetDelayCheck?: boolean): boolean;
+    private presentAmount;
     private fireFistEnterCBs;
     addFirstEnterCallback(cb: (action: PresenceGroupFirstEnterAction) => void): void;
     private motionSensorOnAnyMovement;

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

@@ -18,7 +18,7 @@ class PresenceGroup extends base_group_1.BaseGroup {
         this.deviceCluster.deviceMap.set(device_cluster_type_1.DeviceClusterType.MotionDetection, new device_list_1.DeviceList(motionSensorIds));
     }
     get lastLeftDelayActive() {
-        return this._lastLeftTimeout !== null;
+        return this.getTimeAfterReset() < 0;
     }
     getMotionDetector() {
         return this.deviceCluster.getDevicesByType(device_cluster_type_1.DeviceClusterType.MotionDetection);
@@ -56,8 +56,11 @@ class PresenceGroup extends base_group_1.BaseGroup {
             this.getRoom().setLightTimeBased(new models_1.RoomSetLightTimeBasedCommand(action, true));
         });
     }
-    presentAmount() {
-        return this.getMotionDetector().filter((b) => b.movementDetected).length;
+    anyPresent(includeMovementResetDelayCheck = false) {
+        if (includeMovementResetDelayCheck && this.lastLeftDelayActive) {
+            return true;
+        }
+        return this.presentAmount() > 0;
     }
     addLastLeftCallback(cb) {
         this._lastLeftCbs.push(cb);
@@ -65,11 +68,8 @@ class PresenceGroup extends base_group_1.BaseGroup {
     addAnyMovementCallback(cb) {
         this._anyMovementCbs.push(cb);
     }
-    anyPresent(includeMovementResetDelayCheck = false) {
-        if (includeMovementResetDelayCheck && this.lastLeftDelayActive) {
-            return true;
-        }
-        return this.getMotionDetector().find((b) => b.movementDetected) !== undefined;
+    presentAmount() {
+        return this.getMotionDetector().filter((b) => b.movementDetected).length;
     }
     fireFistEnterCBs(action) {
         for (const cb of this._firstEnterCbs) {
@@ -94,6 +94,7 @@ class PresenceGroup extends base_group_1.BaseGroup {
     motionSensorOnLastLeft(action) {
         let timeAfterReset = this.getTimeAfterReset();
         if (timeAfterReset > 0) {
+            this._lastLeftTimeout = null;
             this.log(models_1.LogLevel.Debug, `Movement reset. Active Motions: ${this.presentAmount()}\tTime after Last Movement including Reset: ${timeAfterReset}`);
             this.executeLastLeftCbs(new models_1.PresenceGroupLastLeftAction(action));
             return;

package/lib/server/devices/hmIPDevices/hmIpHeizgruppe.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { HmIPDevice } from './hmIpDevice';
 import { iDisposable } from '../../services';
 import { HeaterSettings, HumiditySensorChangeAction, TemperatureSensorChangeAction } from '../../../models';

package/lib/server/devices/scene/room-scene.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { iScene } from '../baseDeviceInterfaces';
 import { LogLevel, RoomBase, SceneSettings } from '../../../models';
 import { TvDevice } from '../tv';

package/lib/server/devices/shelly/shellyTrv.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { ShellyDevice } from './shellyDevice';
 import { iBatteryDevice, iHeater } from '../baseDeviceInterfaces';
 import { BatteryLevelChangeAction, HeaterSettings } from '../../../models';

package/lib/server/devices/smartGarden/smartGardenSensor.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { iHumiditySensor, iTemperatureSensor } from '../baseDeviceInterfaces';
 import { SmartGardenDevice } from './smartGardenDevice';
 import { HumiditySensorChangeAction, TemperatureSensorChangeAction } from '../../../models';

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

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { ZigbeeDevice } from './zigbeeDevice';
 import { iBatteryDevice, iHeater } from '../../baseDeviceInterfaces';
 import { BatteryLevelChangeAction, HeaterSettings } from '../../../../models';

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

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { DeviceType } from '../../deviceType';
 import { ZigbeeDevice } from './index';
 import { BatteryLevelChangeAction, MotionSensorAction, MotionSensorSettings } from '../../../../models';

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

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { DeviceType } from '../../deviceType';
 import { ShutterCalibration, ShutterSetLevelCommand, ShutterSettings } from '../../../../models';
 import { ZigbeeDevice } from './zigbeeDevice';

package/lib/server/devices/zigbee/zigbeeAquaraWater.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { ZigbeeDevice } from './BaseDevices';
 import { BatteryLevelChangeAction } from '../../../models';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';

package/lib/server/devices/zigbee/zigbeeHeimanSmoke.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { ZigbeeDevice } from './BaseDevices';
 import { BatteryLevelChangeAction } from '../../../models';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';

package/lib/server/devices/zigbee/zigbeeSonoffTemp.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { ZigbeeDevice } from './BaseDevices';
 import { iBatteryDevice, iHumiditySensor, iTemperatureSensor } from '../baseDeviceInterfaces';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';

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

@@ -1,5 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
 import { IncomingMessage } from 'http';
 import { iDisposable } from '../services';
 import { ConnectionCallbacks } from '../../models';

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

@@ -20,13 +20,9 @@ class AcDevice {
      * @returns {boolean} True if the AC is allowed to cool
      */
     get coolingAllowed() {
-        var _a, _b;
         if (settings_service_1.SettingsService.heatMode !== config_1.HeatingMode.Summer) {
             return false;
         }
-        if (this.settings.noCoolingOnMovement && ((_b = (_a = this.room) === null || _a === void 0 ? void 0 : _a.PraesenzGroup) === null || _b === void 0 ? void 0 : _b.anyPresent(true))) {
-            return false;
-        }
         if (weather_1.WeatherService.active &&
             weather_1.WeatherService.todayMaxTemp < this.settings.minOutdoorTempForCooling &&
             weather_1.WeatherService.todayMaxTemp !== devices_1.UNDEFINED_TEMP_VALUE) {
@@ -128,7 +124,7 @@ class AcDevice {
     }
     /** @inheritDoc */
     isAvailableForExcessEnergy() {
-        var _a, _b;
+        var _a, _b, _c, _d;
         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;
         }
@@ -138,7 +134,13 @@ class AcDevice {
         if (!utils_1.Utils.timeWithinBorders(this.settings.minimumHours, this.settings.minimumMinutes, this.settings.maximumHours, this.settings.maximumMinutes)) {
             return false;
         }
-        return this.calculateDesiredMode() !== ac_mode_1.AcMode.Off;
+        const desiredMode = this.calculateDesiredMode();
+        if (desiredMode === ac_mode_1.AcMode.Cooling &&
+            this.settings.noCoolingOnMovement &&
+            ((_d = (_c = this.room) === null || _c === void 0 ? void 0 : _c.PraesenzGroup) === null || _d === void 0 ? void 0 : _d.anyPresent(true))) {
+            return false;
+        }
+        return true;
     }
     /** @inheritDoc */
     calculateDesiredMode() {
@@ -224,10 +226,17 @@ class AcDevice {
     }
     /** @inheritDoc */
     turnOnForExcessEnergy() {
+        var _a, _b;
         if (this.blockAutomationHandler.automaticBlockActive) {
             return;
         }
         this._activatedByExcessEnergy = true;
+        const desiredMode = this.calculateDesiredMode();
+        if (desiredMode === ac_mode_1.AcMode.Cooling &&
+            this.settings.noCoolingOnMovement &&
+            ((_b = (_a = this.room) === null || _a === void 0 ? void 0 : _a.PraesenzGroup) === null || _b === void 0 ? void 0 : _b.anyPresent(true))) {
+            return;
+        }
         this.setDesiredMode(this.calculateDesiredMode(), false);
         this.turnOn();
     }
@@ -278,6 +287,7 @@ class AcDevice {
         }, 5000, this);
     }
     automaticCheck() {
+        var _a, _b;
         if (this.blockAutomationHandler.automaticBlockActive) {
             // We aren't allowed to turn on or off anyway --> exit
             return;
@@ -288,7 +298,10 @@ class AcDevice {
             return;
         }
         this.setDesiredMode(desiredMode, false);
-        if (desiredMode == ac_mode_1.AcMode.Off) {
+        if (desiredMode == ac_mode_1.AcMode.Off ||
+            (desiredMode === ac_mode_1.AcMode.Cooling &&
+                this.settings.noCoolingOnMovement &&
+                ((_b = (_a = this.room) === null || _a === void 0 ? void 0 : _a.PraesenzGroup) === null || _b === void 0 ? void 0 : _b.anyPresent(true)))) {
             this.turnOff();
             return;
         }

package/lib/server/services/govee/own-govee-device.js

@@ -192,9 +192,6 @@ class OwnGoveeDevice {
         });
     }
     turnOn() {
-        if (this._actuatorOn) {
-            return;
-        }
         this.queuedValue = true;
         govee_service_1.GooveeService.sendCommand(this, `on/true`).then((result) => {
             if (!result) {
@@ -206,9 +203,6 @@ class OwnGoveeDevice {
         });
     }
     turnOff() {
-        if (!this._actuatorOn) {
-            return;
-        }
         this.queuedValue = false;
         govee_service_1.GooveeService.sendCommand(this, `on/false`).then((result) => {
             if (!result) {

package/lib/server/services/utils/utils.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { iPersist } from '../dbo';
 import { CatchEmResult } from './catchEmResult';
 import { iTimePair } from '../../config';