hoffmation-base 1.1.39 → 1.1.41

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

@@ -1,165 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZigbeeIlluDimmer = void 0;
-const models_1 = require("../../../models");
-const deviceType_1 = require("../deviceType");
-const services_1 = require("../../services");
 const BaseDevices_1 = require("./BaseDevices");
-const DeviceCapability_1 = require("../DeviceCapability");
-class ZigbeeIlluDimmer extends BaseDevices_1.ZigbeeDevice {
-    constructor(pInfo, deviceType = deviceType_1.DeviceType.ZigbeeIlluDimmer) {
-        super(pInfo, deviceType);
-        this.lightOn = false;
-        this.queuedValue = null;
-        this.brightness = 0;
-        this.transitionTime = 0;
-        this.settings = new models_1.DimmerSettings();
-        this.stateID = 'state';
-        this.brightnessID = 'brightness';
-        this.transitionID = 'transition_time';
-        this._turnOffTimeout = undefined;
-        this.turnOffTime = 0;
-        this._lastPersist = 0;
-        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.lamp);
-        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.dimmablelamp);
-        this.stateID = `${this.info.fullID}.state`;
-        this.brightnessID = `${this.info.fullID}.brightness`;
-        this.transitionID = `${this.info.fullID}.transition_time`;
-    }
-    get actuatorOn() {
-        return this.lightOn;
-    }
-    update(idSplit, state, initial = false) {
-        this.queuedValue = null;
-        this.log(models_1.LogLevel.DeepTrace, `Dimmer Update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
-        super.update(idSplit, state, initial, true);
-        switch (idSplit[3]) {
-            case 'state':
-                this.log(models_1.LogLevel.Trace, `Dimmer Update für ${this.info.customName} auf ${state.val}`);
-                this.lightOn = state.val;
-                this.persist();
-                break;
-            case 'brightness':
-                this.log(models_1.LogLevel.Trace, `Dimmer Helligkeit Update für ${this.info.customName} auf ${state.val}`);
-                this.brightness = state.val;
-                this.persist();
-                break;
-            case 'transition_time':
-                this.log(models_1.LogLevel.Trace, `Dimmer Transition Time Update für ${this.info.customName} auf ${state.val}`);
-                this.transitionTime = state.val;
-                break;
-        }
-    }
-    setTimeBased(time, timeout = -1, force = false) {
-        switch (time) {
-            case models_1.TimeOfDay.Night:
-                this.setLight(true, timeout, force, this.settings.nightBrightness);
-                break;
-            case models_1.TimeOfDay.AfterSunset:
-                this.setLight(true, timeout, force, this.settings.dawnBrightness);
-                break;
-            case models_1.TimeOfDay.BeforeSunrise:
-                this.setLight(true, timeout, force, this.settings.duskBrightness);
-                break;
-            case models_1.TimeOfDay.Daylight:
-                this.setLight(true, timeout, force, this.settings.dayBrightness);
-                break;
-        }
-    }
-    setActuator(pValue, timeout, force) {
-        this.setLight(pValue, timeout, force);
-    }
-    toggleActuator(force) {
-        return this.toggleLight(undefined, force);
-    }
-    /**
-     * @inheritDoc
-     * @param pValue The desired value
-     * @param timeout If > 0 time at which this should be turned off again
-     * @param force if it is an user based action which should override automatic ones
-     * @param {number} brightness The desired brightness in percent
-     * @param {number} transitionTime The transition time for the brightness, to switch smoothly
-     */
-    setLight(pValue, timeout = -1, force = false, brightness = -1, transitionTime = -1) {
-        if (this.stateID === '') {
-            this.log(models_1.LogLevel.Error, `Keine State ID bekannt.`);
-            return;
-        }
-        if (!this.ioConn) {
-            this.log(models_1.LogLevel.Error, `Keine Connection bekannt.`);
-            return;
-        }
-        if (transitionTime > -1) {
-            this.ioConn.setState(this.transitionID, transitionTime, (err) => {
-                if (err) {
-                    this.log(models_1.LogLevel.Error, `Dimmer TransitionTime schalten ergab Fehler: ${err}`);
-                }
-            });
-        }
-        if (!force && services_1.Utils.nowMS() < this.turnOffTime) {
-            this.log(models_1.LogLevel.Debug, `Skip automatic command to ${pValue} as it is locked until ${new Date(this.turnOffTime).toLocaleTimeString()}`);
-            return;
-        }
-        if (pValue && brightness === -1 && this.brightness < 10) {
-            brightness = 10;
-        }
-        this.log(models_1.LogLevel.Debug, `Set Light Acutator to "${pValue}" with brightness ${brightness}`, services_1.LogDebugType.SetActuator);
-        this.setState(this.stateID, pValue);
-        this.queuedValue = pValue;
-        if (brightness > -1) {
-            if (brightness < this.settings.turnOnThreshhold) {
-                this.setState(this.brightnessID, this.settings.turnOnThreshhold, () => {
-                    services_1.Utils.guardedTimeout(() => {
-                        this.log(models_1.LogLevel.Info, `Delayed reduced brightness on ${this.info.customName}`);
-                        this.setState(this.brightnessID, brightness);
-                    }, 1000, this);
-                });
-            }
-            else {
-                this.setState(this.brightnessID, brightness);
-            }
-        }
-        if (this._turnOffTimeout !== undefined) {
-            clearTimeout(this._turnOffTimeout);
-            this._turnOffTimeout = undefined;
-        }
-        if (timeout < 0 || !pValue) {
-            return;
-        }
-        this.turnOffTime = services_1.Utils.nowMS() + timeout;
-        this._turnOffTimeout = services_1.Utils.guardedTimeout(() => {
-            this.log(models_1.LogLevel.Debug, `Delayed Turnoff initiated`);
-            this._turnOffTimeout = undefined;
-            if (!this.room) {
-                this.setLight(false, -1, true);
-            }
-            else {
-                this.room.setLightTimeBased(true);
-            }
-        }, timeout, this);
-    }
-    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;
-    }
-    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;
+const deviceType_1 = require("../deviceType");
+class ZigbeeIlluDimmer extends BaseDevices_1.ZigbeeDimmer {
+    constructor(pInfo) {
+        super(pInfo, deviceType_1.DeviceType.ZigbeeIlluDimmer);
+        this._stateNameBrightness = 'brightness';
+        this._stateNameState = 'state';
+        this._stateNameTransitionTime = 'transition_time';
+        this._stateIdState = `${this.info.fullID}.state`;
+        this._stateIdBrightness = `${this.info.fullID}.brightness`;
+        this._stateIdTransitionTime = `${this.info.fullID}.transition_time`;
     }
 }
 exports.ZigbeeIlluDimmer = ZigbeeIlluDimmer;

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

@@ -1,16 +1,15 @@
-/// <reference types="iobroker" />
-import { LedSettings, TimeOfDay } from '../../../models';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
-import { ZigbeeIlluDimmer } from './zigbeeIlluDimmer';
-export declare class ZigbeeIlluLedRGBCCT extends ZigbeeIlluDimmer {
-    static DEFAULT_COLOR_WARM: string;
-    color: string;
-    colortemp: number;
-    settings: LedSettings;
-    private colorID;
-    private colorTempID;
+import { ZigbeeLedRGBCCT } from './BaseDevices';
+export declare class ZigbeeIlluLedRGBCCT extends ZigbeeLedRGBCCT {
+    protected readonly _stateIdBrightness: string;
+    protected readonly _stateIdColor: string;
+    protected readonly _stateIdColorTemp: string;
+    protected readonly _stateIdState: string;
+    protected readonly _stateIdTransitionTime: string;
+    protected readonly _stateNameBrightness: string;
+    protected readonly _stateNameState: string;
+    protected readonly _stateNameTransitionTime: string;
+    protected readonly _stateNameColor: string;
+    protected readonly _stateNameColorTemp: string;
     constructor(pInfo: IoBrokerDeviceInfo);
-    update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
-    setTimeBased(time: TimeOfDay, timeout?: number, force?: boolean): void;
-    setLight(pValue: boolean, timeout?: number, force?: boolean, brightness?: number, transitionTime?: number, color?: string, colorTemp?: number): void;
 }

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

@@ -2,93 +2,20 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZigbeeIlluLedRGBCCT = void 0;
 const deviceType_1 = require("../deviceType");
-const models_1 = require("../../../models");
-const zigbeeIlluDimmer_1 = require("./zigbeeIlluDimmer");
-class ZigbeeIlluLedRGBCCT extends zigbeeIlluDimmer_1.ZigbeeIlluDimmer {
-    // private effectID: string = '';
+const BaseDevices_1 = require("./BaseDevices");
+class ZigbeeIlluLedRGBCCT extends BaseDevices_1.ZigbeeLedRGBCCT {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.ZigbeeIlluLedRGBCCT);
-        this.color = '#fcba32';
-        this.colortemp = 500;
-        this.settings = new models_1.LedSettings();
-        this.colorID = '';
-        this.colorTempID = '';
-        this.colorID = `${this.info.fullID}.color`;
-        this.colorTempID = `${this.info.fullID}.colortemp`;
-        // this.effectID = `${this.info.fullID}.effect`;
-    }
-    update(idSplit, state, initial = false) {
-        this.log(models_1.LogLevel.DeepTrace, `LED Update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
-        super.update(idSplit, state, initial);
-        switch (idSplit[3]) {
-            case 'color':
-                this.log(models_1.LogLevel.Trace, `LED Color Update für ${this.info.customName} auf ${state.val}`);
-                this.color = state.val;
-                break;
-            case 'colortemp':
-                this.log(models_1.LogLevel.Trace, `LED Color Update für ${this.info.customName} auf ${state.val}`);
-                this.colortemp = state.val;
-                break;
-        }
-    }
-    setTimeBased(time, timeout = -1, force = false) {
-        switch (time) {
-            case models_1.TimeOfDay.Night:
-                if (this.settings.nightOn) {
-                    this.setLight(true, timeout, force, this.settings.nightBrightness, undefined, this.settings.nightColor, this.settings.nightColorTemp);
-                }
-                break;
-            case models_1.TimeOfDay.AfterSunset:
-                if (this.settings.duskOn) {
-                    this.setLight(true, timeout, force, this.settings.duskBrightness, undefined, this.settings.duskColor, this.settings.duskColorTemp);
-                }
-                break;
-            case models_1.TimeOfDay.BeforeSunrise:
-                if (this.settings.dawnOn) {
-                    this.setLight(true, timeout, force, this.settings.dawnBrightness, undefined, this.settings.dawnColor, this.settings.dawnColorTemp);
-                }
-                break;
-            case models_1.TimeOfDay.Daylight:
-                if (this.settings.dayOn) {
-                    this.setLight(true, timeout, force, this.settings.dayBrightness, undefined, this.settings.dayColor, this.settings.dayColorTemp);
-                }
-                break;
-        }
-    }
-    setLight(pValue, timeout, force, brightness = -1, transitionTime, color = '', colorTemp = -1) {
-        if (this.stateID === '') {
-            this.log(models_1.LogLevel.Error, `Keine State ID bekannt.`);
-            return;
-        }
-        if (!this.ioConn) {
-            this.log(models_1.LogLevel.Error, `Keine Connection bekannt.`);
-            return;
-        }
-        if (pValue && brightness === -1 && this.brightness < 10) {
-            brightness = 10;
-        }
-        this.log(models_1.LogLevel.Debug, `LED Schalten An: ${pValue}\tHelligkeit: ${brightness}%\tFarbe: "${color}"\tColorTemperatur: ${colorTemp}`);
-        super.setLight(pValue, timeout, force, brightness, transitionTime);
-        if (color !== '') {
-            this.ioConn.setState(this.colorID, color, (err) => {
-                if (err) {
-                    this.log(models_1.LogLevel.Error, `LED Farbe schalten ergab Fehler: ${err}`);
-                }
-            });
-        }
-        if (colorTemp > -1) {
-            this.ioConn.setState(this.colorTempID, colorTemp, (err) => {
-                if (err) {
-                    this.log(models_1.LogLevel.Error, `LED Farbwärme schalten ergab Fehler: ${err}`);
-                }
-            });
-        }
-        this.ioConn.setState(this.stateID, pValue, (err) => {
-            if (err) {
-                this.log(models_1.LogLevel.Error, `LED schalten ergab Fehler: ${err}`);
-            }
-        });
+        this._stateNameBrightness = 'brightness';
+        this._stateNameState = 'state';
+        this._stateNameTransitionTime = 'transition_time';
+        this._stateNameColor = 'color';
+        this._stateNameColorTemp = 'colortemp';
+        this._stateIdBrightness = `${this.info.fullID}.brightness`;
+        this._stateIdColor = `${this.info.fullID}.color`;
+        this._stateIdColorTemp = `${this.info.fullID}.colortemp`;
+        this._stateIdState = `${this.info.fullID}.state`;
+        this._stateIdTransitionTime = `${this.info.fullID}.transition_time`;
     }
 }
 exports.ZigbeeIlluLedRGBCCT = ZigbeeIlluLedRGBCCT;
-ZigbeeIlluLedRGBCCT.DEFAULT_COLOR_WARM = '#f2b200';

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

@@ -53,6 +53,18 @@ export declare class API {
      * @returns {Error | null} In case it failed the Error containing the reason
      */
     static setDimmer(deviceId: string, state: boolean, timeout?: number, brightness?: number, transitionTime?: number): Error | null;
+    /**
+     * Changes the status of a given actuator
+     * @param {string} deviceId The device Id of the actuator
+     * @param {boolean} state The desired new state
+     * @param timeout A chosen Timeout after which the light should be reset
+     * @param brightness The desired brightness
+     * @param transitionTime The transition time during turnOn/turnOff
+     * @param {string} color The desired color in 6 digit hex Code
+     * @param {number} colorTemp The desired color Temperature (0 = more White)
+     * @returns {Error | null} In case it failed the Error containing the reason
+     */
+    static setLedLamp(deviceId: string, state: boolean, timeout?: number, brightness?: number, transitionTime?: number, color?: string, colorTemp?: number): Error | null;
     static setShutter(deviceId: string, level: number): Error | null;
     static speakOnDevice(deviceId: string, message: string, volume?: number): Error | null;
 }

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

@@ -125,6 +125,28 @@ class API {
         d.setLight(state, timeout, true, brightness, transitionTime);
         return null;
     }
+    /**
+     * Changes the status of a given actuator
+     * @param {string} deviceId The device Id of the actuator
+     * @param {boolean} state The desired new state
+     * @param timeout A chosen Timeout after which the light should be reset
+     * @param brightness The desired brightness
+     * @param transitionTime The transition time during turnOn/turnOff
+     * @param {string} color The desired color in 6 digit hex Code
+     * @param {number} colorTemp The desired color Temperature (0 = more White)
+     * @returns {Error | null} In case it failed the Error containing the reason
+     */
+    static setLedLamp(deviceId, state, timeout, brightness, transitionTime, color, colorTemp) {
+        const d = this.getDevice(deviceId);
+        if (d === undefined) {
+            return new Error(`Device with ID ${deviceId} not found`);
+        }
+        if (!d.deviceCapabilities.includes(DeviceCapability_1.DeviceCapability.ledLamp)) {
+            return new Error(`Device with ID ${deviceId} is no dimmablelamp`);
+        }
+        d.setLight(state, timeout, true, brightness, transitionTime, color, colorTemp);
+        return null;
+    }
     static setShutter(deviceId, level) {
         const d = this.getDevice(deviceId);
         if (d === undefined) {

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

@@ -5,6 +5,8 @@ export declare class SettingsService {
     static get Mp3Active(): boolean;
     static initialize(config: iConfig): void;
     static get heatMode(): HeatingMode;
+    static get latitude(): number;
+    static get longitude(): number;
     /**
      * @deprecated Only use in unit tests
      * @returns {iConfig}

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

@@ -16,6 +16,26 @@ class SettingsService {
         var _a, _b, _c;
         return (_c = (_b = (_a = this.settings) === null || _a === void 0 ? void 0 : _a.heaterSettings) === null || _b === void 0 ? void 0 : _b.mode) !== null && _c !== void 0 ? _c : config_1.HeatingMode.None;
     }
+    static get latitude() {
+        var _a, _b;
+        if (((_b = (_a = this.settings) === null || _a === void 0 ? void 0 : _a.weather) === null || _b === void 0 ? void 0 : _b.lattitude) !== undefined) {
+            const lat = parseFloat(this.settings.weather.lattitude);
+            if (!Number.isNaN(lat)) {
+                return lat;
+            }
+        }
+        return 51.529556852253826;
+    }
+    static get longitude() {
+        var _a, _b;
+        if (((_b = (_a = this.settings) === null || _a === void 0 ? void 0 : _a.weather) === null || _b === void 0 ? void 0 : _b.longitude) !== undefined) {
+            const longitude = parseFloat(this.settings.weather.longitude);
+            if (!Number.isNaN(longitude)) {
+                return longitude;
+            }
+        }
+        return 7.097266042276687;
+    }
     /**
      * @deprecated Only use in unit tests
      * @returns {iConfig}

package/lib/server/services/time-callback-service.js

@@ -146,8 +146,8 @@ class TimeCallbackService {
         TimeCallbackService._lastCheck = now;
     }
     static recalcSunTimes(calculationDate = new Date()) {
-        TimeCallbackService._todaySunRise = (0, sunrise_sunset_js_1.getSunrise)(51.529556852253826, 7.097266042276687, calculationDate);
-        TimeCallbackService._todaySunSet = (0, sunrise_sunset_js_1.getSunset)(51.529556852253826, 7.097266042276687, calculationDate);
+        TimeCallbackService._todaySunRise = (0, sunrise_sunset_js_1.getSunrise)(settings_service_1.SettingsService.latitude, settings_service_1.SettingsService.longitude, calculationDate);
+        TimeCallbackService._todaySunSet = (0, sunrise_sunset_js_1.getSunset)(settings_service_1.SettingsService.latitude, settings_service_1.SettingsService.longitude, calculationDate);
         TimeCallbackService.updateSunSet();
         TimeCallbackService.updateSunRise();
         log_service_1.ServerLogService.writeLog(models_1.LogLevel.Info, `Nächster Sonnenaufgang um ${TimeCallbackService.nextSunRise.toLocaleTimeString('de-DE')}
@@ -163,14 +163,14 @@ Nächster Sonnenuntergang um ${TimeCallbackService._nextSunSet.toLocaleTimeStrin
             return;
         }
     }
-    static updateSunRise(pDay = new Date(), lat = 51.529556852253826, long = 7.097266042276687) {
-        TimeCallbackService._nextSunRise = (0, sunrise_sunset_js_1.getSunrise)(lat, long, pDay);
+    static updateSunRise(pDay = new Date(), lat, long) {
+        TimeCallbackService._nextSunRise = (0, sunrise_sunset_js_1.getSunrise)(lat !== null && lat !== void 0 ? lat : settings_service_1.SettingsService.latitude, long !== null && long !== void 0 ? long : settings_service_1.SettingsService.longitude, pDay);
     }
-    static updateSunSet(pDay = new Date(), lat = 51.529556852253826, long = 7.097266042276687) {
-        TimeCallbackService._nextSunSet = this.getSunsetForDate(pDay, lat, long);
+    static updateSunSet(pDay = new Date(), lat, long) {
+        TimeCallbackService._nextSunSet = this.getSunsetForDate(pDay, lat !== null && lat !== void 0 ? lat : settings_service_1.SettingsService.latitude, long !== null && long !== void 0 ? long : settings_service_1.SettingsService.longitude);
     }
-    static getSunsetForDate(pDay = new Date(), lat = 51.529556852253826, long = 7.097266042276687) {
-        return (0, sunrise_sunset_js_1.getSunset)(lat, long, pDay);
+    static getSunsetForDate(pDay = new Date(), lat, long) {
+        return (0, sunrise_sunset_js_1.getSunset)(lat !== null && lat !== void 0 ? lat : settings_service_1.SettingsService.latitude, long !== null && long !== void 0 ? long : settings_service_1.SettingsService.longitude, pDay);
     }
 }
 exports.TimeCallbackService = TimeCallbackService;