hoffmation-base 1.0.23 → 1.0.25-alpha.0

package/lib/models/deviceSettings/wledSettings.d.ts

@@ -0,0 +1,15 @@
+import { DeviceSettings } from './deviceSettings';
+export declare class WledSettings extends DeviceSettings {
+    dayOn: boolean;
+    dayBrightness: number;
+    dawnOn: boolean;
+    dawnBrightness: number;
+    duskOn: boolean;
+    duskBrightness: number;
+    nightOn: boolean;
+    nightBrightness: number;
+    dawnPreset?: number;
+    dayPreset?: number;
+    duskPreset?: number;
+    nightPreset?: number;
+}

package/lib/models/deviceSettings/wledSettings.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WledSettings = void 0;
+const deviceSettings_1 = require("./deviceSettings");
+class WledSettings extends deviceSettings_1.DeviceSettings {
+    constructor() {
+        super(...arguments);
+        this.dayOn = false;
+        this.dayBrightness = 100;
+        this.dawnOn = true;
+        this.dawnBrightness = 50;
+        this.duskOn = true;
+        this.duskBrightness = 50;
+        this.nightOn = true;
+        this.nightBrightness = 2;
+    }
+}
+exports.WledSettings = WledSettings;

package/lib/server/devices/{button.d.ts → button/button.d.ts}

@@ -1,15 +1,5 @@
-export declare class ButtonCapabilities {
-    shortPress: boolean;
-    doublePress: boolean;
-    triplePress: boolean;
-    longPress: boolean;
-}
-export declare enum ButtonPressType {
-    short = 0,
-    long = 1,
-    double = 2,
-    triple = 3
-}
+import { ButtonCapabilities } from './buttonCapabilities';
+import { ButtonPressType } from './buttonPressType';
 export declare class Button {
     name: string;
     buttonCapabilities: ButtonCapabilities;
@@ -21,4 +11,5 @@ export declare class Button {
     addCb(buttonType: ButtonPressType, pCallback: (pValue: boolean) => void, description?: string): void;
     getDescription(): string;
     updateState(type: ButtonPressType, pValue: boolean): void;
+    toJSON(): Partial<Button>;
 }

package/lib/server/devices/{button.js → button/button.js}

@@ -1,24 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Button = exports.ButtonPressType = exports.ButtonCapabilities = void 0;
-const services_1 = require("../services");
-const models_1 = require("../../models");
-class ButtonCapabilities {
-    constructor() {
-        this.shortPress = true;
-        this.doublePress = true;
-        this.triplePress = true;
-        this.longPress = true;
-    }
-}
-exports.ButtonCapabilities = ButtonCapabilities;
-var ButtonPressType;
-(function (ButtonPressType) {
-    ButtonPressType[ButtonPressType["short"] = 0] = "short";
-    ButtonPressType[ButtonPressType["long"] = 1] = "long";
-    ButtonPressType[ButtonPressType["double"] = 2] = "double";
-    ButtonPressType[ButtonPressType["triple"] = 3] = "triple";
-})(ButtonPressType = exports.ButtonPressType || (exports.ButtonPressType = {}));
+exports.Button = void 0;
+const services_1 = require("../../services");
+const models_1 = require("../../../models");
+const buttonPressType_1 = require("./buttonPressType");
 class Button {
     constructor(name, buttonCapabilities) {
         this.name = name;
@@ -27,24 +12,24 @@ class Button {
         this._callbacks = new Map();
         this._timeouts = new Map();
         if (buttonCapabilities.shortPress) {
-            this._callbacks.set(ButtonPressType.short, []);
-            this._timeouts.set(ButtonPressType.short, null);
-            this._state.set(ButtonPressType.short, false);
+            this._callbacks.set(buttonPressType_1.ButtonPressType.short, []);
+            this._timeouts.set(buttonPressType_1.ButtonPressType.short, null);
+            this._state.set(buttonPressType_1.ButtonPressType.short, false);
         }
         if (buttonCapabilities.longPress) {
-            this._callbacks.set(ButtonPressType.long, []);
-            this._timeouts.set(ButtonPressType.long, null);
-            this._state.set(ButtonPressType.long, false);
+            this._callbacks.set(buttonPressType_1.ButtonPressType.long, []);
+            this._timeouts.set(buttonPressType_1.ButtonPressType.long, null);
+            this._state.set(buttonPressType_1.ButtonPressType.long, false);
         }
         if (buttonCapabilities.doublePress) {
-            this._callbacks.set(ButtonPressType.double, []);
-            this._timeouts.set(ButtonPressType.double, null);
-            this._state.set(ButtonPressType.double, false);
+            this._callbacks.set(buttonPressType_1.ButtonPressType.double, []);
+            this._timeouts.set(buttonPressType_1.ButtonPressType.double, null);
+            this._state.set(buttonPressType_1.ButtonPressType.double, false);
         }
         if (buttonCapabilities.triplePress) {
-            this._callbacks.set(ButtonPressType.triple, []);
-            this._timeouts.set(ButtonPressType.triple, null);
-            this._state.set(ButtonPressType.triple, false);
+            this._callbacks.set(buttonPressType_1.ButtonPressType.triple, []);
+            this._timeouts.set(buttonPressType_1.ButtonPressType.triple, null);
+            this._state.set(buttonPressType_1.ButtonPressType.triple, false);
         }
     }
     getState(type) {
@@ -54,7 +39,7 @@ class Button {
     addCb(buttonType, pCallback, description = 'Not described') {
         const cbArr = this._callbacks.get(buttonType);
         if (cbArr === undefined) {
-            services_1.ServerLogService.writeLog(models_1.LogLevel.Error, `This Button doesn't support press Type ${ButtonPressType[buttonType]}`);
+            services_1.ServerLogService.writeLog(models_1.LogLevel.Error, `This Button doesn't support press Type ${buttonPressType_1.ButtonPressType[buttonType]}`);
             return;
         }
         cbArr.push({ cb: pCallback, description: description });
@@ -63,7 +48,7 @@ class Button {
         const description = [];
         for (const [key, arr] of this._callbacks.entries()) {
             for (const entry of arr) {
-                description.push(`${ButtonPressType[key]}: "${entry.description}"`);
+                description.push(`${buttonPressType_1.ButtonPressType[key]}: "${entry.description}"`);
             }
         }
         return description.join('\n');
@@ -75,7 +60,7 @@ class Button {
         }
         this._state.set(type, pValue);
         if (!this._callbacks.has(type)) {
-            services_1.ServerLogService.writeLog(models_1.LogLevel.Error, `This Button doesn't support press Type ${ButtonPressType[type]}`);
+            services_1.ServerLogService.writeLog(models_1.LogLevel.Error, `This Button doesn't support press Type ${buttonPressType_1.ButtonPressType[type]}`);
             return;
         }
         for (const c of (_a = this._callbacks.get(type)) !== null && _a !== void 0 ? _a : []) {
@@ -92,5 +77,8 @@ class Button {
             this.updateState(type, false);
         }, 5000, this));
     }
+    toJSON() {
+        return services_1.Utils.jsonFilter(this);
+    }
 }
 exports.Button = Button;

package/lib/server/devices/button/buttonCapabilities.d.ts

@@ -0,0 +1,6 @@
+export declare class ButtonCapabilities {
+    shortPress: boolean;
+    doublePress: boolean;
+    triplePress: boolean;
+    longPress: boolean;
+}

package/lib/server/devices/button/buttonCapabilities.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ButtonCapabilities = void 0;
+class ButtonCapabilities {
+    constructor() {
+        this.shortPress = true;
+        this.doublePress = true;
+        this.triplePress = true;
+        this.longPress = true;
+    }
+}
+exports.ButtonCapabilities = ButtonCapabilities;

package/lib/server/devices/button/buttonPressType.d.ts

@@ -0,0 +1,6 @@
+export declare enum ButtonPressType {
+    short = 0,
+    long = 1,
+    double = 2,
+    triple = 3
+}

package/lib/server/devices/button/buttonPressType.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ButtonPressType = void 0;
+var ButtonPressType;
+(function (ButtonPressType) {
+    ButtonPressType[ButtonPressType["short"] = 0] = "short";
+    ButtonPressType[ButtonPressType["long"] = 1] = "long";
+    ButtonPressType[ButtonPressType["double"] = 2] = "double";
+    ButtonPressType[ButtonPressType["triple"] = 3] = "triple";
+})(ButtonPressType = exports.ButtonPressType || (exports.ButtonPressType = {}));

package/lib/server/devices/button/index.d.ts

@@ -0,0 +1,3 @@
+export * from './button';
+export * from './buttonCapabilities';
+export * from './buttonPressType';

package/lib/server/devices/button/index.js

@@ -0,0 +1,19 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./button"), exports);
+__exportStar(require("./buttonCapabilities"), exports);
+__exportStar(require("./buttonPressType"), exports);

package/lib/server/devices/device-cluster-type.d.ts

@@ -17,5 +17,6 @@ export declare enum DeviceClusterType {
     MagnetContact = 15,
     TemperaturSensor = 16,
     HumiditySensor = 17,
-    Ac = 18
+    Ac = 18,
+    WLED = 19
 }

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

@@ -22,4 +22,5 @@ var DeviceClusterType;
     DeviceClusterType[DeviceClusterType["TemperaturSensor"] = 16] = "TemperaturSensor";
     DeviceClusterType[DeviceClusterType["HumiditySensor"] = 17] = "HumiditySensor";
     DeviceClusterType[DeviceClusterType["Ac"] = 18] = "Ac";
+    DeviceClusterType[DeviceClusterType["WLED"] = 19] = "WLED";
 })(DeviceClusterType = exports.DeviceClusterType || (exports.DeviceClusterType = {}));

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

@@ -2,11 +2,13 @@ import { ZigbeeIkeaSteckdose, ZigbeeIlluLedRGBCCT } from '../zigbee';
 import { BaseGroup } from './base-group';
 import { iLamp } from '../baseDeviceInterfaces';
 import { TimeOfDay } from '../../../models';
+import { WledDevice } from '../wledDevice';
 export declare class LampenGroup extends BaseGroup {
-    constructor(roomName: string, lampenIds?: string[], steckerIds?: string[], ledIds?: string[]);
+    constructor(roomName: string, lampenIds?: string[], steckerIds?: string[], ledIds?: string[], wledIds?: string[]);
     anyLightsOn(): boolean;
     getLampen(): iLamp[];
     getLED(): ZigbeeIlluLedRGBCCT[];
+    getWled(): WledDevice[];
     getStecker(): ZigbeeIkeaSteckdose[];
     handleSunriseOff(): void;
     switchAll(target: boolean, force?: boolean): void;

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

@@ -8,11 +8,12 @@ const device_cluster_type_1 = require("../device-cluster-type");
 const device_list_1 = require("../device-list");
 const models_1 = require("../../../models");
 class LampenGroup extends base_group_1.BaseGroup {
-    constructor(roomName, lampenIds = [], steckerIds = [], ledIds = []) {
+    constructor(roomName, lampenIds = [], steckerIds = [], ledIds = [], wledIds = []) {
         super(roomName, group_type_1.GroupType.Light);
         this.deviceCluster.deviceMap.set(device_cluster_type_1.DeviceClusterType.Lamps, new device_list_1.DeviceList(lampenIds));
         this.deviceCluster.deviceMap.set(device_cluster_type_1.DeviceClusterType.Outlets, new device_list_1.DeviceList(steckerIds));
         this.deviceCluster.deviceMap.set(device_cluster_type_1.DeviceClusterType.LED, new device_list_1.DeviceList(ledIds));
+        this.deviceCluster.deviceMap.set(device_cluster_type_1.DeviceClusterType.WLED, new device_list_1.DeviceList(wledIds));
     }
     anyLightsOn() {
         let i;
@@ -31,6 +32,11 @@ class LampenGroup extends base_group_1.BaseGroup {
                 return true;
             }
         }
+        for (i = 0; i < this.getWled().length; i++) {
+            if (this.getWled()[i].on) {
+                return true;
+            }
+        }
         return false;
     }
     getLampen() {
@@ -39,6 +45,9 @@ class LampenGroup extends base_group_1.BaseGroup {
     getLED() {
         return this.deviceCluster.getIoBrokerDevicesByType(device_cluster_type_1.DeviceClusterType.LED);
     }
+    getWled() {
+        return this.deviceCluster.getIoBrokerDevicesByType(device_cluster_type_1.DeviceClusterType.WLED);
+    }
     getStecker() {
         return this.deviceCluster.getIoBrokerDevicesByType(device_cluster_type_1.DeviceClusterType.Outlets);
     }
@@ -55,6 +64,9 @@ class LampenGroup extends base_group_1.BaseGroup {
         this.getLED().forEach((s) => {
             s.setLight(target);
         });
+        this.getWled().forEach((wled) => {
+            wled.setLight(target);
+        });
     }
     switchTimeConditional(time) {
         const darkOutside = services_1.TimeCallbackService.darkOutsideOrNight(time);
@@ -65,6 +77,9 @@ class LampenGroup extends base_group_1.BaseGroup {
             this.getLED().forEach((s) => {
                 s.setTimeBased(time);
             });
+            this.getWled().forEach((wled) => {
+                wled.setTimeBased(time);
+            });
         }
         else if (this.getStecker().length > 0) {
             this.log(models_1.LogLevel.Trace, `Set outlets time based for time "${models_1.TimeOfDay[time]}"`);

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

@@ -5,8 +5,8 @@ const base_group_1 = require("./base-group");
 const device_cluster_type_1 = require("../device-cluster-type");
 const group_type_1 = require("./group-type");
 const device_list_1 = require("../device-list");
-const button_1 = require("../button");
 const services_1 = require("../../services");
+const button_1 = require("../button");
 class TasterGroup extends base_group_1.BaseGroup {
     constructor(roomName, buttonIds) {
         super(roomName, group_type_1.GroupType.Buttons);

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

@@ -1,10 +1,10 @@
 export * from './baseDeviceInterfaces/index';
+export * from './button/index';
 export * from './groups/index';
 export * from './hmIPDevices/index';
 export * from './jsObject/index';
 export * from './models/index';
 export * from './zigbee/index';
-export * from './button';
 export * from './device-cluster';
 export * from './device-cluster-type';
 export * from './device-list';

package/lib/server/devices/index.js

@@ -15,12 +15,12 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./baseDeviceInterfaces/index"), exports);
+__exportStar(require("./button/index"), exports);
 __exportStar(require("./groups/index"), exports);
 __exportStar(require("./hmIPDevices/index"), exports);
 __exportStar(require("./jsObject/index"), exports);
 __exportStar(require("./models/index"), exports);
 __exportStar(require("./zigbee/index"), exports);
-__exportStar(require("./button"), exports);
 __exportStar(require("./device-cluster"), exports);
 __exportStar(require("./device-cluster-type"), exports);
 __exportStar(require("./device-list"), exports);

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

@@ -1,16 +1,20 @@
 /// <reference types="iobroker" />
 import { IoBrokerBaseDevice } from './IoBrokerBaseDevice';
 import { DeviceInfo } from './DeviceInfo';
+import { TimeOfDay } from '../../models';
+import { WledSettings } from '../../models/deviceSettings/wledSettings';
 export declare class WledDevice extends IoBrokerBaseDevice {
     on: boolean;
     brightness: number;
     linkQuality: number;
     battery: number;
     voltage: string;
-    private _onID;
-    private _brightnessID;
+    settings: WledSettings;
+    private readonly _onID;
+    private readonly _presetID;
+    private readonly _brightnessID;
     constructor(pInfo: DeviceInfo);
     update(idSplit: string[], state: ioBroker.State, initial?: boolean, _pOverride?: boolean): void;
-    setLight(pValue: boolean, brightness?: number): void;
-    protected addToCorrectRoom(): void;
+    setLight(pValue: boolean, brightness?: number, preset?: number): void;
+    setTimeBased(time: TimeOfDay): void;
 }

package/lib/server/devices/wledDevice.js

@@ -5,6 +5,7 @@ const IoBrokerBaseDevice_1 = require("./IoBrokerBaseDevice");
 const deviceType_1 = require("./deviceType");
 const services_1 = require("../services");
 const models_1 = require("../../models");
+const wledSettings_1 = require("../../models/deviceSettings/wledSettings");
 class WledDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.Wled);
@@ -13,8 +14,10 @@ class WledDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
         this.linkQuality = 0;
         this.battery = -1;
         this.voltage = '';
+        this.settings = new wledSettings_1.WledSettings();
         this.addToCorrectRoom();
         this._onID = `${this.info.fullID}.on`;
+        this._presetID = `${this.info.fullID}.ps`;
         this._brightnessID = `${this.info.fullID}.bri`;
     }
     update(idSplit, state, initial = false, _pOverride = false) {
@@ -28,7 +31,7 @@ class WledDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
                 break;
         }
     }
-    setLight(pValue, brightness = -1) {
+    setLight(pValue, brightness = -1, preset) {
         if (this._onID === '') {
             services_1.ServerLogService.writeLog(models_1.LogLevel.Error, `Keine On ID für "${this.info.customName}" bekannt.`);
             return;
@@ -37,10 +40,15 @@ class WledDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
             services_1.ServerLogService.writeLog(models_1.LogLevel.Error, `Keine Connection für "${this.info.customName}" bekannt.`);
             return;
         }
-        if (pValue && brightness === -1 && this.brightness < 10) {
+        if (pValue && brightness !== -1 && this.brightness < 10) {
             brightness = 10;
         }
         services_1.ServerLogService.writeLog(models_1.LogLevel.Debug, `WLED Schalten: "${this.info.customName}" An: ${pValue}\tHelligkeit: ${brightness}%`);
+        if (preset !== undefined) {
+            this.setState(this._presetID, preset, undefined, (err) => {
+                services_1.ServerLogService.writeLog(models_1.LogLevel.Error, `WLED schalten ergab Fehler: ${err}`);
+            });
+        }
         this.setState(this._onID, pValue, undefined, (err) => {
             services_1.ServerLogService.writeLog(models_1.LogLevel.Error, `WLED schalten ergab Fehler: ${err}`);
         });
@@ -50,14 +58,28 @@ class WledDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
             });
         }
     }
-    addToCorrectRoom() {
-        services_1.ServerLogService.writeLog(models_1.LogLevel.DeepTrace, `Neues Zigbee Gerät für ${this._info.room}`);
-        switch (this._info.room) {
-            case 'Wohnz':
-                // room1OGWohn.addWLED(this._info);
+    setTimeBased(time) {
+        switch (time) {
+            case models_1.TimeOfDay.Night:
+                if (this.settings.nightOn) {
+                    this.setLight(true, this.settings.nightBrightness, this.settings.nightPreset);
+                }
+                break;
+            case models_1.TimeOfDay.AfterSunset:
+                if (this.settings.duskOn) {
+                    this.setLight(true, this.settings.duskBrightness, this.settings.duskPreset);
+                }
+                break;
+            case models_1.TimeOfDay.BeforeSunrise:
+                if (this.settings.dawnOn) {
+                    this.setLight(true, this.settings.dawnBrightness, this.settings.dawnPreset);
+                }
+                break;
+            case models_1.TimeOfDay.Daylight:
+                if (this.settings.dayOn) {
+                    this.setLight(true, this.settings.dayBrightness, this.settings.dayPreset);
+                }
                 break;
-            default:
-                console.warn(`${this._info.room} ist noch kein bekannter Raum für WLED Geräte`);
         }
     }
 }

package/lib/server/services/Telegram/telegram-service.js

@@ -78,9 +78,8 @@ class TelegramService {
         this.sendMessage(this.subscribedIDs, message);
     }
     static sendMessage(ids, message) {
-        if (!TelegramService.active) {
-            // We can't use Log Service here, as it might result in a recursion
-            console.log(`Telegram message ${message} wasn't send as TelegramService is inactive`);
+        if (!this.active) {
+            log_service_1.ServerLogService.writeLog(models_1.LogLevel.Debug, `Would have send telegram message, but telegram is not active`);
             return;
         }
         const chunksNeeded = Math.ceil(message.length / 4095);

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

@@ -16,7 +16,7 @@ class API {
         return ac_1.OwnAcDevices.ownDevices[name];
     }
     static getDevices() {
-        // console.log(inspect(Devices.alLDevices, false, 3));
+        // console.log(Util.inspect(Devices.alLDevices, false, 5));
         return devices_1.Devices.alLDevices;
     }
     static getDevice(id) {

package/lib/server/services/calendar/m/303/274ll-service.d.ts

@@ -11,6 +11,7 @@ export declare class MuellService {
     static graueTonne: MuellTonne;
     static gelbeTonne: MuellTonne;
     static brauneTonne: MuellTonne;
+    static loadingPending: boolean;
     static updateTimeCallback: TimeCallback;
     static checkTimeCallback: TimeCallback;
     static months: string[];

package/lib/server/services/calendar/m/303/274ll-service.js

@@ -27,6 +27,7 @@ class MuellService {
         node_ical_1.async
             .fromURL(this._calendarURL)
             .then((data) => {
+            this.loadingPending = false;
             this.gelbeTonne = new muell_tonne_1.MuellTonne('Gelbe Tonne', this.defaultSonosDevice);
             this.graueTonne = new muell_tonne_1.MuellTonne('Graue Tonne', this.defaultSonosDevice);
             this.blaueTonne = new muell_tonne_1.MuellTonne('Blaue Tonne', this.defaultSonosDevice);
@@ -73,6 +74,7 @@ class MuellService {
             }
         })
             .catch((r) => {
+            this.loadingPending = true;
             log_service_1.ServerLogService.writeLog(models_1.LogLevel.Error, `Loading Trash Calendar failed with error: "${r}"`);
         });
     }
@@ -106,6 +108,7 @@ class MuellService {
 }
 exports.MuellService = MuellService;
 MuellService.alleTonnen = [];
+MuellService.loadingPending = true;
 MuellService.months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
 MuellService.lastCheck = new Date(0);
 MuellService._active = false;