hoffmation-base 3.0.0-alpha.52 → 3.0.0-alpha.54

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

@@ -34,6 +34,7 @@ class DeviceCluster {
                 break;
             case deviceType_1.DeviceType.Camera:
                 clusterTypes.push(device_cluster_type_1.DeviceClusterType.Camera);
+                clusterTypes.push(device_cluster_type_1.DeviceClusterType.MotionDetection);
                 break;
             case deviceType_1.DeviceType.HmIpLampe:
             case deviceType_1.DeviceType.ZigbeeIlluDimmer:
@@ -76,6 +77,7 @@ class DeviceCluster {
                 clusterTypes.push(device_cluster_type_1.DeviceClusterType.MotionDetection);
                 break;
             case deviceType_1.DeviceType.ZigbeeIkeaSteckdose:
+            case deviceType_1.DeviceType.ZigbeeBlitzShp:
                 clusterTypes.push(device_cluster_type_1.DeviceClusterType.Outlets);
                 break;
             case deviceType_1.DeviceType.ZigbeeIlluLedRGBCCT:
@@ -93,9 +95,6 @@ class DeviceCluster {
             case deviceType_1.DeviceType.ZigbeeAquaraWater:
                 clusterTypes.push(device_cluster_type_1.DeviceClusterType.WaterDetectors);
                 break;
-            case deviceType_1.DeviceType.ZigbeeBlitzShp:
-                clusterTypes.push(device_cluster_type_1.DeviceClusterType.Outlets);
-                break;
             case deviceType_1.DeviceType.WledDevice:
                 clusterTypes.push(device_cluster_type_1.DeviceClusterType.WLED);
                 break;
@@ -105,6 +104,7 @@ class DeviceCluster {
             case deviceType_1.DeviceType.HmIpHeizung: // Setting/Controlling via HM-Ip Heizgruppe
             case deviceType_1.DeviceType.unknown:
             case deviceType_1.DeviceType.HmIpAccessPoint: // You can't really do stuff with it.
+            case deviceType_1.DeviceType.ShellyActuator: // Dependent on use case
                 break;
         }
         for (const type of clusterTypes) {

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

@@ -41,6 +41,7 @@ export declare enum DeviceType {
     JsEnergyManager = 301,
     RoomScene = 401,
     ShellyTrv = 402,
+    ShellyActuator = 403,
     TuyaGarageDoorOpener = 501,
     WledDevice = 1001,
     GoveeLed = 1002,

package/lib/server/devices/deviceType.js

@@ -45,6 +45,7 @@ var DeviceType;
     DeviceType[DeviceType["JsEnergyManager"] = 301] = "JsEnergyManager";
     DeviceType[DeviceType["RoomScene"] = 401] = "RoomScene";
     DeviceType[DeviceType["ShellyTrv"] = 402] = "ShellyTrv";
+    DeviceType[DeviceType["ShellyActuator"] = 403] = "ShellyActuator";
     DeviceType[DeviceType["TuyaGarageDoorOpener"] = 501] = "TuyaGarageDoorOpener";
     DeviceType[DeviceType["WledDevice"] = 1001] = "WledDevice";
     DeviceType[DeviceType["GoveeLed"] = 1002] = "GoveeLed";

package/lib/server/devices/devices.js

@@ -12,6 +12,7 @@ const wledDevice_1 = require("./wledDevice");
 const DeviceCapability_1 = require("./DeviceCapability");
 const shelly_1 = require("./shelly");
 const tuya_1 = require("./tuya");
+const shellyActuator_1 = require("./shelly/shellyActuator");
 class Devices {
     constructor(pDeviceData, pRoomImportEnforcer, config) {
         var _a;
@@ -104,6 +105,9 @@ class Devices {
             case 'Trv':
                 d = new shelly_1.ShellyTrv(shellyInfo);
                 break;
+            case 'Actuator':
+                d = new shellyActuator_1.ShellyActuator(shellyInfo);
+                break;
             default:
                 services_1.ServerLogService.writeLog(models_1.LogLevel.Warn, `No shelly Device Type for ${shellyInfo.deviceType} defined`);
                 d = new shelly_1.ShellyDevice(shellyInfo, deviceType_1.DeviceType.unknown);

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

@@ -0,0 +1,33 @@
+import { ShellyDevice } from './shellyDevice';
+import { iActuator } from '../baseDeviceInterfaces';
+import { BlockAutomaticHandler } from '../../services/blockAutomaticHandler';
+import { ActuatorSetStateCommand, ActuatorSettings, ActuatorToggleCommand, ActuatorWriteStateToDeviceCommand, RestoreTargetAutomaticValueCommand } from '../../../models';
+import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
+export declare class ShellyActuator extends ShellyDevice implements iActuator {
+    /** @inheritDoc */
+    readonly blockAutomationHandler: BlockAutomaticHandler;
+    /** @inheritDoc */
+    targetAutomaticState: boolean;
+    /** @inheritDoc */
+    settings: ActuatorSettings;
+    /** @inheritDoc */
+    queuedValue: boolean | null;
+    private _lastPersist;
+    private readonly _actuatorOnStateId;
+    private _actuatorOn;
+    constructor(pInfo: IoBrokerDeviceInfo);
+    /** @inheritDoc */
+    get actuatorOn(): boolean;
+    /** @inheritDoc */
+    restoreTargetAutomaticValue(c: RestoreTargetAutomaticValueCommand): void;
+    /** @inheritDoc */
+    update(idSplit: string[], state: ioBroker.State, initial?: boolean, handledByChildObject?: boolean): void;
+    /** @inheritDoc */
+    setActuator(command: ActuatorSetStateCommand): void;
+    /** @inheritDoc */
+    persist(): void;
+    /** @inheritDoc */
+    toggleActuator(command: ActuatorToggleCommand): boolean;
+    /** @inheritDoc */
+    writeActuatorStateToDevice(c: ActuatorWriteStateToDeviceCommand): void;
+}

package/lib/server/devices/shelly/shellyActuator.js

@@ -0,0 +1,84 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ShellyActuator = void 0;
+const shellyDevice_1 = require("./shellyDevice");
+const blockAutomaticHandler_1 = require("../../services/blockAutomaticHandler");
+const models_1 = require("../../../models");
+const deviceType_1 = require("../deviceType");
+const DeviceCapability_1 = require("../DeviceCapability");
+const sharedFunctions_1 = require("../sharedFunctions");
+const services_1 = require("../../services");
+class ShellyActuator extends shellyDevice_1.ShellyDevice {
+    constructor(pInfo) {
+        super(pInfo, deviceType_1.DeviceType.ShellyActuator);
+        /** @inheritDoc */
+        this.targetAutomaticState = false;
+        /** @inheritDoc */
+        this.settings = new models_1.ActuatorSettings();
+        /** @inheritDoc */
+        this.queuedValue = null;
+        this._lastPersist = 0;
+        this._actuatorOn = false;
+        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.actuator);
+        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.blockAutomatic);
+        this._actuatorOnStateId = `${this.info.fullID}.Relay0.Switch`;
+        this.blockAutomationHandler = new blockAutomaticHandler_1.BlockAutomaticHandler(this.restoreTargetAutomaticValue.bind(this), this.log.bind(this));
+    }
+    /** @inheritDoc */
+    get actuatorOn() {
+        return this._actuatorOn;
+    }
+    /** @inheritDoc */
+    restoreTargetAutomaticValue(c) {
+        this.setActuator(new models_1.ActuatorSetStateCommand(c, this.targetAutomaticState));
+    }
+    /** @inheritDoc */
+    update(idSplit, state, initial = false, handledByChildObject = false) {
+        if (!handledByChildObject) {
+            this.log(models_1.LogLevel.DeepTrace, `Aktuator Update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
+        }
+        this.queuedValue = null;
+        super.update(idSplit, state, initial, true);
+        if (idSplit[3] === 'Relay0') {
+            if (idSplit[4] === 'Switch') {
+                this._actuatorOn = state.val;
+                if (!initial) {
+                    this.persist();
+                }
+            }
+        }
+    }
+    /** @inheritDoc */
+    setActuator(command) {
+        if (this._actuatorOnStateId === '') {
+            this.log(models_1.LogLevel.Error, 'Keine Switch ID bekannt.');
+            return;
+        }
+        sharedFunctions_1.LampUtils.setActuator(this, command);
+    }
+    /** @inheritDoc */
+    persist() {
+        var _a;
+        const now = services_1.Utils.nowMS();
+        if (this._lastPersist + 1000 > now) {
+            return;
+        }
+        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistActuator(this);
+        this._lastPersist = now;
+    }
+    /** @inheritDoc */
+    toggleActuator(command) {
+        const newVal = this.queuedValue !== null ? !this.queuedValue : !this._actuatorOn;
+        const setStateCommand = models_1.ActuatorSetStateCommand.byActuatorAndToggleCommand(this, command);
+        this.setActuator(setStateCommand);
+        return newVal;
+    }
+    /** @inheritDoc */
+    writeActuatorStateToDevice(c) {
+        this.log(models_1.LogLevel.Debug, c.logMessage, services_1.LogDebugType.SetActuator);
+        this.setState(this._actuatorOnStateId, c.stateValue, undefined, (err) => {
+            this.log(models_1.LogLevel.Error, `Lampe schalten ergab Fehler: ${err}`);
+        });
+    }
+}
+exports.ShellyActuator = ShellyActuator;

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

@@ -14,6 +14,7 @@ const DeviceCapability_1 = require("../../devices/DeviceCapability");
 const settings_service_1 = require("../settings-service");
 const config_1 = require("../../config");
 const blockAutomaticHandler_1 = require("../blockAutomaticHandler");
+const weather_1 = require("../weather");
 class AcDevice {
     /**
      * Whether the AC is allowed to cool (depends on the season
@@ -27,6 +28,12 @@ class AcDevice {
         if (this.settings.noCoolingOnMovement && ((_b = (_a = this.room) === null || _a === void 0 ? void 0 : _a.PraesenzGroup) === null || _b === void 0 ? void 0 : _b.anyPresent())) {
             return false;
         }
+        if (weather_1.WeatherService.active &&
+            weather_1.WeatherService.todayMaxTemp < 22 && // TODO: Make this value configurable
+            weather_1.WeatherService.todayMaxTemp !== devices_1.UNDEFINED_TEMP_VALUE) {
+            // As it is quite cold outside there is no need to cool
+            return false;
+        }
         return true;
     }
     /**

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

@@ -26,6 +26,7 @@ export declare class WeatherService {
     private static longitude;
     private static appID?;
     static addWeatherUpdateCb(name: string, cb: () => void): void;
+    static get todayMaxTemp(): number;
     static initialize(config: iWeatherSettings): void;
     static update(): void;
     static stopInterval(): void;

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

@@ -11,10 +11,15 @@ const utils_1 = require("../utils");
 const log_service_1 = require("../log-service");
 const suncalc_1 = __importDefault(require("suncalc"));
 const time_callback_service_1 = require("../time-callback-service");
+const devices_1 = require("../../devices");
 class WeatherService {
     static addWeatherUpdateCb(name, cb) {
         this._dataUpdateCbs[name] = cb;
     }
+    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 : devices_1.UNDEFINED_TEMP_VALUE;
+    }
     static initialize(config) {
         this.active = true;
         this.longitude = config.longitude;