hoffmation-base 3.2.10-alpha.5 → 3.2.10

package/lib/devices/device-cluster.js

@@ -78,6 +78,7 @@ class DeviceCluster {
                 break;
             case enums_1.DeviceType.HmIpBewegung:
             case enums_1.DeviceType.ZigbeeAquaraMotion:
+            case enums_1.DeviceType.ZigbeeAqaraPresence:
             case enums_1.DeviceType.ZigbeeSonoffMotion:
             case enums_1.DeviceType.ZigbeeTuyaMotion:
             case enums_1.DeviceType.HmIpPraezenz:

package/lib/devices/devices.js

@@ -158,6 +158,9 @@ class Devices {
             case 'AquaraMotion':
                 d = new zigbee_1.ZigbeeAquaraMotion(zigbeeInfo);
                 break;
+            case 'AqaraFp1':
+                d = new zigbee_1.ZigbeeAqaraPresence(zigbeeInfo);
+                break;
             case 'AquaraVibra':
                 d = new zigbee_1.ZigbeeAquaraVibra(zigbeeInfo);
                 break;

package/lib/devices/zigbee/index.d.ts

@@ -2,6 +2,7 @@ export * from './BaseDevices';
 export * from './zigbeeAqaraMagnetContact';
 export * from './zigbeeAqaraOpple3Switch';
 export * from './zigbeeAquaraMotion';
+export * from './zigbeeAqaraPresence';
 export * from './zigbeeAquaraVibra';
 export * from './zigbeeAquaraWater';
 export * from './zigbeeBlitzShp';

package/lib/devices/zigbee/index.js

@@ -19,6 +19,7 @@ __exportStar(require("./BaseDevices"), exports);
 __exportStar(require("./zigbeeAqaraMagnetContact"), exports);
 __exportStar(require("./zigbeeAqaraOpple3Switch"), exports);
 __exportStar(require("./zigbeeAquaraMotion"), exports);
+__exportStar(require("./zigbeeAqaraPresence"), exports);
 __exportStar(require("./zigbeeAquaraVibra"), exports);
 __exportStar(require("./zigbeeAquaraWater"), exports);
 __exportStar(require("./zigbeeBlitzShp"), exports);

package/lib/devices/zigbee/zigbeeAqaraPresence.d.ts

@@ -0,0 +1,7 @@
+import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
+import { ZigbeeMotionSensor } from './BaseDevices';
+export declare class ZigbeeAqaraPresence extends ZigbeeMotionSensor {
+    constructor(pInfo: IoBrokerDeviceInfo);
+    /** @inheritDoc */
+    update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
+}

package/lib/devices/zigbee/zigbeeAqaraPresence.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ZigbeeAqaraPresence = void 0;
+const BaseDevices_1 = require("./BaseDevices");
+const enums_1 = require("../../enums");
+class ZigbeeAqaraPresence extends BaseDevices_1.ZigbeeMotionSensor {
+    constructor(pInfo) {
+        super(pInfo, enums_1.DeviceType.ZigbeeAqaraPresence);
+    }
+    /** @inheritDoc */
+    update(idSplit, state, initial = false) {
+        this.log(enums_1.LogLevel.DeepTrace, `Motion update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
+        super.update(idSplit, state, initial, true);
+        switch (idSplit[3]) {
+            case 'presence':
+                this.log(enums_1.LogLevel.Trace, `Motion sensor: Update for motion of ${this.info.customName}: ${state.val}`);
+                this.updateMovement(state.val);
+                break;
+        }
+    }
+}
+exports.ZigbeeAqaraPresence = ZigbeeAqaraPresence;

package/lib/enums/deviceType.d.ts

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

package/lib/enums/deviceType.js

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

package/lib/services/weather/weather-service.d.ts

@@ -23,6 +23,14 @@ export declare class WeatherService {
     private static latitude;
     private static longitude;
     private static appID?;
+    /**
+     * The highest maximum temperature forecast for today (prevents oscillation)
+     */
+    private static _todayMaxMaxTemperature;
+    /**
+     * The date of the last weather update (for daily reset)
+     */
+    private static _lastUpdateDate;
     static addWeatherUpdateCb(name: string, cb: () => void): void;
     static get todayMaxTemp(): number;
     static get todayCloudiness(): number | undefined;
@@ -31,6 +39,11 @@ export declare class WeatherService {
     static stopInterval(): void;
     static playWeatherInfo(speaker: iSpeaker, volume?: number, short?: boolean, retries?: number): void;
     static processHourlyWeather(response: WeatherResponse): void;
+    /**
+     * Updates the daily maximum temperature to prevent shutter oscillation
+     * Tracks the highest forecasted maximum temperature for today
+     */
+    private static updateDailyMaxTemperature;
     static get currentHumidity(): number;
     static get currentTemp(): number;
     static willOutsideBeWarmer(referenceTemperature: number, logger: (level: LogLevel, message: string, debugType?: LogDebugType) => void): boolean;

package/lib/services/weather/weather-service.js

@@ -18,7 +18,9 @@ class WeatherService {
     }
     static get todayMaxTemp() {
         var _a, _b, _c;
-        return (_c = (_b = (_a = WeatherService.lastResponse) === null || _a === void 0 ? void 0 : _a.daily[0]) === null || _b === void 0 ? void 0 : _b.temp.max) !== null && _c !== void 0 ? _c : interfaces_1.UNDEFINED_TEMP_VALUE;
+        return this._todayMaxMaxTemperature !== interfaces_1.UNDEFINED_TEMP_VALUE
+            ? this._todayMaxMaxTemperature
+            : ((_c = (_b = (_a = WeatherService.lastResponse) === null || _a === void 0 ? void 0 : _a.daily[0]) === null || _b === void 0 ? void 0 : _b.temp.max) !== null && _c !== void 0 ? _c : interfaces_1.UNDEFINED_TEMP_VALUE);
     }
     static get todayCloudiness() {
         var _a, _b;
@@ -111,6 +113,8 @@ class WeatherService {
     }
     static processHourlyWeather(response) {
         this.lastResponse = response;
+        // Update daily maximum temperature to prevent shutter oscillation
+        this.updateDailyMaxTemperature();
         logging_1.ServerLogService.writeLog(enums_1.LogLevel.Info, `Es sind gerade ${this.lastResponse.current.temp} Grad (gefühlt ${this.lastResponse.current.feels_like}).`);
         if (this.lastResponse.alerts !== undefined && this.lastResponse.alerts.length > 0) {
             const message = ['Es gibt folgende Wetterwarnungen:'];
@@ -120,6 +124,24 @@ class WeatherService {
             logging_1.ServerLogService.writeLog(enums_1.LogLevel.Info, message.join('\n'));
         }
     }
+    /**
+     * Updates the daily maximum temperature to prevent shutter oscillation
+     * Tracks the highest forecasted maximum temperature for today
+     */
+    static updateDailyMaxTemperature() {
+        var _a, _b, _c, _d;
+        if (!((_d = (_c = (_b = (_a = this.lastResponse) === null || _a === void 0 ? void 0 : _a.daily) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.temp) === null || _d === void 0 ? void 0 : _d.max)) {
+            return;
+        }
+        const today = new Date().toDateString();
+        const currentForecastMax = this.lastResponse.daily[0].temp.max;
+        if (this._lastUpdateDate === today && currentForecastMax < this._todayMaxMaxTemperature) {
+            return;
+        }
+        this._todayMaxMaxTemperature = currentForecastMax;
+        this._lastUpdateDate = today;
+        logging_1.ServerLogService.writeLog(enums_1.LogLevel.Debug, `Daily max temperature updated to ${currentForecastMax}°C`);
+    }
     static get currentHumidity() {
         var _a;
         if (((_a = WeatherService.lastResponse) === null || _a === void 0 ? void 0 : _a.current) === undefined) {
@@ -264,3 +286,11 @@ WeatherService.active = false;
  */
 WeatherService.oneDay = 1000 * 60 * 60 * 24;
 WeatherService._dataUpdateCbs = {};
+/**
+ * The highest maximum temperature forecast for today (prevents oscillation)
+ */
+WeatherService._todayMaxMaxTemperature = interfaces_1.UNDEFINED_TEMP_VALUE;
+/**
+ * The date of the last weather update (for daily reset)
+ */
+WeatherService._lastUpdateDate = '';