hoffmation-base 2.20.5 → 2.21.0

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

@@ -6,36 +6,37 @@ const services_1 = require("../../../services");
 const index_1 = require("./index");
 const DeviceCapability_1 = require("../../DeviceCapability");
 const blockAutomaticHandler_1 = require("../../../services/blockAutomaticHandler");
+const sharedFunctions_1 = require("../../sharedFunctions");
 class ZigbeeDimmer extends index_1.ZigbeeDevice {
-    get lightOn() {
-        return this._lightOn;
-    }
-    get brightness() {
-        return this._brightness;
-    }
-    get transitionTime() {
-        return this._transitionTime;
-    }
-    get actuatorOn() {
-        return this.lightOn;
-    }
     constructor(pInfo, deviceType) {
         super(pInfo, deviceType);
         this.queuedValue = null;
         this.settings = new models_1.DimmerSettings();
-        this._brightness = 0;
+        this.targetAutomaticState = false;
         this._lastPersist = 0;
+        this._brightness = 0;
         this._lightOn = false;
         this._transitionTime = 0;
-        this._targetAutomaticState = false;
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.lamp);
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.dimmablelamp);
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.blockAutomatic);
         this.blockAutomationHandler = new blockAutomaticHandler_1.BlockAutomaticHandler(this.restoreTargetAutomaticValue.bind(this));
     }
+    get brightness() {
+        return this._brightness;
+    }
+    get lightOn() {
+        return this._lightOn;
+    }
+    get transitionTime() {
+        return this._transitionTime;
+    }
+    get actuatorOn() {
+        return this.lightOn;
+    }
     restoreTargetAutomaticValue() {
         this.log(models_1.LogLevel.Debug, `Restore Target Automatic value`);
-        this.setActuator(this._targetAutomaticState);
+        this.setActuator(this.targetAutomaticState);
     }
     update(idSplit, state, initial = false) {
         this.queuedValue = null;
@@ -104,18 +105,8 @@ class ZigbeeDimmer extends index_1.ZigbeeDevice {
                 }
             });
         }
-        let dontBlock = false;
-        if (force &&
-            this.settings.resetToAutomaticOnForceOffAfterForceOn &&
-            !pValue &&
-            this.blockAutomationHandler.automaticBlockActive) {
-            dontBlock = true;
-            this.log(models_1.LogLevel.Debug, `Reset Automatic Block as we are turning off manually after a force on`);
-            this.blockAutomationHandler.liftAutomaticBlock();
-        }
-        if (!force && this.blockAutomationHandler.automaticBlockActive) {
-            this.log(models_1.LogLevel.Debug, `Skip automatic command to ${pValue} as it is locked until ${new Date(this.blockAutomationHandler.automaticBlockedUntil).toLocaleTimeString()}`);
-            this._targetAutomaticState = pValue;
+        const dontBlock = sharedFunctions_1.LampUtils.checkUnBlock(this, force, pValue);
+        if (sharedFunctions_1.LampUtils.checkBlockActive(this, force, pValue)) {
             return;
         }
         if (pValue && brightness === -1 && this.brightness < 10) {
@@ -151,17 +142,7 @@ class ZigbeeDimmer extends index_1.ZigbeeDevice {
         this._lastPersist = now;
     }
     toggleLight(time, force = false, calculateTime = false) {
-        const newVal = this.queuedValue !== null ? !this.queuedValue : !this.lightOn;
-        const timeout = newVal && force ? 30 * 60 * 1000 : -1;
-        if (newVal && time === undefined && calculateTime && this.room) {
-            time = services_1.TimeCallbackService.dayType(this.room.settings.lampOffset);
-        }
-        if (newVal && time !== undefined) {
-            this.setTimeBased(time, timeout, force);
-            return true;
-        }
-        this.setLight(newVal, timeout, force);
-        return newVal;
+        return sharedFunctions_1.LampUtils.toggleLight(this, time, force, calculateTime);
     }
 }
 exports.ZigbeeDimmer = ZigbeeDimmer;

package/lib/server/devices/zigbee/zigbeeIlluLampe.js

@@ -6,6 +6,7 @@ const zigbeeIlluActuator_1 = require("./zigbeeIlluActuator");
 const models_1 = require("../../../models");
 const services_1 = require("../../services");
 const DeviceCapability_1 = require("../DeviceCapability");
+const sharedFunctions_1 = require("../sharedFunctions");
 class ZigbeeIlluLampe extends zigbeeIlluActuator_1.ZigbeeIlluActuator {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.ZigbeeIlluLampe);
@@ -25,36 +26,17 @@ class ZigbeeIlluLampe extends zigbeeIlluActuator_1.ZigbeeIlluActuator {
     /** @inheritdoc */
     setLight(pValue, timeout = -1, force = false) {
         this.log(models_1.LogLevel.Debug, `Set Light Acutator to "${pValue}"`, services_1.LogDebugType.SetActuator);
-        if (this.settings.isStromStoss) {
+        if (this.settings.isStromStoss && pValue) {
             timeout = 3000;
-            services_1.Utils.guardedTimeout(() => {
-                var _a;
-                if ((_a = this.room.PraesenzGroup) === null || _a === void 0 ? void 0 : _a.anyPresent()) {
-                    this.setLight(true, -1, true);
-                }
-            }, this.settings.stromStossResendTime * 1000, this);
+            sharedFunctions_1.LampUtils.stromStossOn(this);
         }
         super.setActuator(pValue, timeout, force);
     }
     toggleLight(time, force = false, calculateTime = false) {
-        const newVal = this.queuedValue !== null ? !this.queuedValue : !this.lightOn;
-        const timeout = newVal && force ? 30 * 60 * 1000 : -1;
-        if (newVal && time === undefined && calculateTime) {
-            time = services_1.TimeCallbackService.dayType(this.room.settings.lampOffset);
-        }
-        if (newVal && time !== undefined) {
-            this.setTimeBased(time, timeout, force);
-            return true;
-        }
-        this.setLight(newVal, timeout, force);
-        return newVal;
+        return sharedFunctions_1.LampUtils.toggleLight(this, time, force, calculateTime);
     }
     setTimeBased(time, timeout = -1, force = false) {
-        if ((time === models_1.TimeOfDay.Night && this.settings.nightOn) ||
-            (time === models_1.TimeOfDay.BeforeSunrise && this.settings.dawnOn) ||
-            (time === models_1.TimeOfDay.AfterSunset && this.settings.duskOn)) {
-            this.setLight(true, timeout, force);
-        }
+        sharedFunctions_1.LampUtils.setTimeBased(this, time, timeout, force);
     }
     persist() {
         var _a;

package/lib/server/devices/zigbee/zigbeeUbisysLampe.js

@@ -6,6 +6,7 @@ const models_1 = require("../../../models");
 const services_1 = require("../../services");
 const DeviceCapability_1 = require("../DeviceCapability");
 const zigbeeUbisysActuator_1 = require("./zigbeeUbisysActuator");
+const sharedFunctions_1 = require("../sharedFunctions");
 class ZigbeeUbisysLampe extends zigbeeUbisysActuator_1.ZigbeeUbisysActuator {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.ZigbeeUbisysLampe);
@@ -25,37 +26,17 @@ class ZigbeeUbisysLampe extends zigbeeUbisysActuator_1.ZigbeeUbisysActuator {
     /** @inheritdoc */
     setLight(pValue, timeout = -1, force = false) {
         this.log(models_1.LogLevel.Debug, `Set Light Acutator to "${pValue}"`, services_1.LogDebugType.SetActuator);
-        if (this.settings.isStromStoss) {
+        if (this.settings.isStromStoss && pValue) {
             timeout = 3000;
-            services_1.Utils.guardedTimeout(() => {
-                var _a;
-                if (this.room && ((_a = this.room.PraesenzGroup) === null || _a === void 0 ? void 0 : _a.anyPresent())) {
-                    this.setLight(true, -1, true);
-                }
-            }, this.settings.stromStossResendTime * 1000, this);
+            sharedFunctions_1.LampUtils.stromStossOn(this);
         }
         super.setActuator(pValue, timeout, force);
     }
     toggleLight(time, force = false, calculateTime = false) {
-        var _a;
-        const newVal = this.queuedValue !== null ? !this.queuedValue : !this.lightOn;
-        const timeout = newVal && force ? 30 * 60 * 1000 : -1;
-        if (newVal && time === undefined && calculateTime && this.room !== undefined) {
-            time = services_1.TimeCallbackService.dayType((_a = this.room) === null || _a === void 0 ? void 0 : _a.settings.lampOffset);
-        }
-        if (newVal && time !== undefined) {
-            this.setTimeBased(time, timeout, force);
-            return true;
-        }
-        this.setLight(newVal, timeout, force);
-        return newVal;
+        return sharedFunctions_1.LampUtils.toggleLight(this, time, force, calculateTime);
     }
     setTimeBased(time, timeout = -1, force = false) {
-        if ((time === models_1.TimeOfDay.Night && this.settings.nightOn) ||
-            (time === models_1.TimeOfDay.BeforeSunrise && this.settings.dawnOn) ||
-            (time === models_1.TimeOfDay.AfterSunset && this.settings.duskOn)) {
-            this.setLight(true, timeout, force);
-        }
+        sharedFunctions_1.LampUtils.setTimeBased(this, time, timeout, force);
     }
     persist() {
         var _a;

package/lib/server/services/govee/own-govee-device.d.ts

@@ -13,21 +13,22 @@ export declare class OwnGoveeDevice implements iLedRgbCct, iTemporaryDisableAuto
     readonly deviceCapabilities: DeviceCapability[];
     readonly blockAutomationHandler: BlockAutomaticHandler;
     on: boolean;
+    queuedValue: boolean | null;
     brightness: number;
+    targetAutomaticState: boolean;
     constructor(deviceId: string, ownDeviceName: string, roomName: string, device: GoveeDevice | undefined);
     private _color;
-    private _colortemp;
-    private _targetAutomaticState;
-    private _room;
     get color(): string;
+    private _colortemp;
     get colortemp(): number;
+    private _room;
+    get room(): RoomBase;
     get customName(): string;
     get actuatorOn(): boolean;
     get lightOn(): boolean;
     protected _info: DeviceInfo;
     get info(): DeviceInfo;
     set info(info: DeviceInfo);
-    get room(): RoomBase;
     get id(): string;
     get name(): string;
     log(level: LogLevel, message: string, debugType?: LogDebugType): void;
@@ -44,12 +45,12 @@ export declare class OwnGoveeDevice implements iLedRgbCct, iTemporaryDisableAuto
     setLight(pValue: boolean, timeout?: number, force?: boolean, brightness?: number, _transitionTime?: number, color?: string, colorTemp?: number): void;
     setActuator(pValue: boolean, timeout?: number, force?: boolean): void;
     restoreTargetAutomaticValue(): void;
-    private setBrightness;
-    private setColor;
-    private turnOn;
-    private turnOff;
     persist(): void;
     toggleActuator(_force: boolean): boolean;
     toggleLight(time?: TimeOfDay, _force?: boolean, calculateTime?: boolean): boolean;
     update(data: GoveeDeviceState): void;
+    private setBrightness;
+    private setColor;
+    private turnOn;
+    private turnOff;
 }

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

@@ -12,7 +12,6 @@ const lodash_1 = __importDefault(require("lodash"));
 const DeviceCapability_1 = require("../../devices/DeviceCapability");
 const api_1 = require("../api");
 const blockAutomaticHandler_1 = require("../blockAutomaticHandler");
-const time_callback_service_1 = require("../time-callback-service");
 class OwnGoveeDevice {
     constructor(deviceId, ownDeviceName, roomName, device) {
         this.device = device;
@@ -25,10 +24,11 @@ class OwnGoveeDevice {
             DeviceCapability_1.DeviceCapability.blockAutomatic,
         ];
         this.on = false;
+        this.queuedValue = null;
         this.brightness = -1;
+        this.targetAutomaticState = false;
         this._color = '#fcba32';
         this._colortemp = 500;
-        this._targetAutomaticState = false;
         this._room = undefined;
         this.deviceId = deviceId;
         this._info = new devices_1.DeviceInfo();
@@ -47,6 +47,12 @@ class OwnGoveeDevice {
     get colortemp() {
         return this._colortemp;
     }
+    get room() {
+        if (this._room === undefined) {
+            this._room = utils_1.Utils.guard(api_1.API.getRoom(this.info.room));
+        }
+        return this._room;
+    }
     get customName() {
         return this.info.customName;
     }
@@ -62,12 +68,6 @@ class OwnGoveeDevice {
     set info(info) {
         this._info = info;
     }
-    get room() {
-        if (this._room === undefined) {
-            this._room = utils_1.Utils.guard(api_1.API.getRoom(this.info.room));
-        }
-        return this._room;
-    }
     get id() {
         var _a;
         return (_a = this.info.allDevicesKey) !== null && _a !== void 0 ? _a : `govee-${this.info.room}-${this.info.customName}`;
@@ -135,18 +135,8 @@ class OwnGoveeDevice {
         if (formattedColor !== null) {
             this.setColor(color);
         }
-        let dontBlock = false;
-        if (force &&
-            this.settings.resetToAutomaticOnForceOffAfterForceOn &&
-            !pValue &&
-            this.blockAutomationHandler.automaticBlockActive) {
-            dontBlock = true;
-            this.log(models_1.LogLevel.Debug, `Reset Automatic Block as we are turning off manually after a force on`);
-            this.blockAutomationHandler.liftAutomaticBlock();
-        }
-        if (!force && this.blockAutomationHandler.automaticBlockActive) {
-            this.log(models_1.LogLevel.Debug, `Skip automatic command to ${pValue} as it is locked until ${new Date(this.blockAutomationHandler.automaticBlockedUntil).toLocaleTimeString()}`);
-            this._targetAutomaticState = pValue;
+        const dontBlock = devices_1.LampUtils.checkUnBlock(this, force, pValue);
+        if (devices_1.LampUtils.checkBlockActive(this, force, pValue)) {
             return;
         }
         this.log(models_1.LogLevel.Debug, `Set Light Acutator to "${pValue}" with brightness ${brightness}`, log_service_1.LogDebugType.SetActuator);
@@ -171,7 +161,25 @@ class OwnGoveeDevice {
     }
     restoreTargetAutomaticValue() {
         this.log(models_1.LogLevel.Debug, `Restore Target Automatic value`);
-        this.setActuator(this._targetAutomaticState);
+        this.setActuator(this.targetAutomaticState);
+    }
+    persist() {
+        var _a;
+        (_a = utils_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistActuator(this);
+    }
+    toggleActuator(_force) {
+        this.setLight(!this.on);
+        return this.on;
+    }
+    toggleLight(time, _force = false, calculateTime = false) {
+        return devices_1.LampUtils.toggleLight(this, time, _force, calculateTime);
+    }
+    update(data) {
+        this.queuedValue = null;
+        this.on = data.isOn === 1;
+        this.brightness = data.brightness;
+        this._color = `#${data.color.r.toString(16)}${data.color.g.toString(16)}${data.color.b.toString(16)}`;
+        this._colortemp = data.colorKelvin;
     }
     setBrightness(brightness, cb) {
         var _a;
@@ -197,6 +205,7 @@ class OwnGoveeDevice {
         if (this.on) {
             return;
         }
+        this.queuedValue = true;
         (_a = this.device) === null || _a === void 0 ? void 0 : _a.actions.setOn().then(() => {
             this.log(models_1.LogLevel.Debug, `Govee turned on`, log_service_1.LogDebugType.SetActuator);
         }).catch((error) => {
@@ -205,37 +214,12 @@ class OwnGoveeDevice {
     }
     turnOff() {
         var _a;
+        this.queuedValue = false;
         (_a = this.device) === null || _a === void 0 ? void 0 : _a.actions.setOff().then(() => {
             this.log(models_1.LogLevel.Debug, `Govee turned off`, log_service_1.LogDebugType.SetActuator);
         }).catch((error) => {
             this.log(models_1.LogLevel.Error, `Govee turn off resulted in error: ${error}`);
         });
     }
-    persist() {
-        var _a;
-        (_a = utils_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistActuator(this);
-    }
-    toggleActuator(_force) {
-        this.setLight(!this.on);
-        return this.on;
-    }
-    toggleLight(time, _force = false, calculateTime = false) {
-        const newVal = !this.lightOn;
-        if (newVal && time === undefined && calculateTime) {
-            time = time_callback_service_1.TimeCallbackService.dayType(this.room.settings.lampOffset);
-        }
-        if (newVal && time !== undefined) {
-            this.setTimeBased(time);
-            return true;
-        }
-        this.setLight(newVal);
-        return newVal;
-    }
-    update(data) {
-        this.on = data.isOn === 1;
-        this.brightness = data.brightness;
-        this._color = `#${data.color.r.toString(16)}${data.color.g.toString(16)}${data.color.b.toString(16)}`;
-        this._colortemp = data.colorKelvin;
-    }
 }
 exports.OwnGoveeDevice = OwnGoveeDevice;