hoffmation-base 0.1.22 → 0.1.26

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

@@ -1,38 +1,16 @@
 /// <reference types="iobroker" />
-import { IOBrokerConnection } from '../ioBroker/connection';
 import { DeviceInfo } from './DeviceInfo';
-export declare class WledDevice {
+import { IoBrokerBaseDevice } from './IoBrokerBaseDevice';
+export declare class WledDevice extends IoBrokerBaseDevice {
     on: boolean;
     brightness: number;
     linkQuality: number;
     battery: number;
     voltage: string;
-    private _info;
-    private _ioConnection?;
     private _onID;
     private _brightnessID;
     constructor(pInfo: DeviceInfo);
-    /**
-     * Getter info
-     * @return {DeviceInfo}
-     */
-    get info(): DeviceInfo;
-    /**
-     * Setter info
-     * @param {DeviceInfo} value
-     */
-    set info(value: DeviceInfo);
-    /**
-     * Getter ioConn
-     * @return {IOBrokerConnection}
-     */
-    get ioConn(): IOBrokerConnection | undefined;
-    /**
-     * Setter ioConn
-     * @param {IOBrokerConnection} value
-     */
-    set ioConn(value: IOBrokerConnection | undefined);
-    private addToCorrectRoom;
-    update(idSplit: string[], state: ioBroker.State, initial?: boolean, pOverride?: boolean): void;
+    update(idSplit: string[], state: ioBroker.State, initial?: boolean, _pOverride?: boolean): void;
     setLight(pValue: boolean, brightness?: number): void;
+    protected addToCorrectRoom(): void;
 }

package/lib/server/devices/wledDevice.js

@@ -3,61 +3,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.WledDevice = void 0;
 const logLevel_1 = require("../../models/logLevel");
 const log_service_1 = require("../services/log-service");
-class WledDevice {
+const IoBrokerBaseDevice_1 = require("./IoBrokerBaseDevice");
+const deviceType_1 = require("./deviceType");
+class WledDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
     constructor(pInfo) {
+        super(pInfo, deviceType_1.DeviceType.Wled);
         this.on = false;
         this.brightness = -1;
         this.linkQuality = 0;
         this.battery = -1;
         this.voltage = '';
-        this._info = pInfo;
         this.addToCorrectRoom();
         this._onID = `${this.info.fullID}.on`;
         this._brightnessID = `${this.info.fullID}.bri`;
     }
-    /**
-     * Getter info
-     * @return {DeviceInfo}
-     */
-    get info() {
-        return this._info;
-    }
-    /**
-     * Setter info
-     * @param {DeviceInfo} value
-     */
-    set info(value) {
-        this._info = value;
-    }
-    /**
-     * Getter ioConn
-     * @return {IOBrokerConnection}
-     */
-    get ioConn() {
-        return this._ioConnection;
-    }
-    /**
-     * Setter ioConn
-     * @param {IOBrokerConnection} value
-     */
-    set ioConn(value) {
-        this._ioConnection = value;
-    }
-    addToCorrectRoom() {
-        log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.DeepTrace, `Neues Zigbee Gerät für ${this._info.room}`);
-        switch (this._info.room) {
-            case 'Wohnz':
-                // room1OGWohn.addWLED(this._info);
-                break;
-            default:
-                console.warn(`${this._info.room} ist noch kein bekannter Raum für WLED Geräte`);
-        }
-    }
-    update(idSplit, state, initial = false, pOverride = false) {
+    update(idSplit, state, initial = false, _pOverride = false) {
         log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.DeepTrace, `Wled: ${initial ? 'Initiales ' : ''}Update für "${this.info.customName}": ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
-        if (!pOverride) {
-            log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Warn, `Keine Update Überschreibung für "${this.info.customName}":\n\tID: ${idSplit.join('.')}\n\tData: ${JSON.stringify(state)}`);
-        }
         switch (idSplit[3]) {
             case 'on':
                 this.on = state.val;
@@ -93,5 +54,15 @@ class WledDevice {
             });
         }
     }
+    addToCorrectRoom() {
+        log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.DeepTrace, `Neues Zigbee Gerät für ${this._info.room}`);
+        switch (this._info.room) {
+            case 'Wohnz':
+                // room1OGWohn.addWLED(this._info);
+                break;
+            default:
+                console.warn(`${this._info.room} ist noch kein bekannter Raum für WLED Geräte`);
+        }
+    }
 }
 exports.WledDevice = WledDevice;

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

@@ -1,7 +1,7 @@
 /// <reference types="iobroker" />
 import { ZigbeeDevice } from './zigbeeDevice';
 import { DeviceInfo } from '../DeviceInfo';
-import { ZigbeeDeviceType } from './zigbeeDeviceType';
+import { DeviceType } from '../deviceType';
 import { ActuatorSettings as ActuatorSettings } from '../../../models/actuatorSettings';
 export declare class ZigbeeActuator extends ZigbeeDevice {
     settings: ActuatorSettings;
@@ -10,7 +10,7 @@ export declare class ZigbeeActuator extends ZigbeeDevice {
     protected actuatorOn: boolean;
     private turnOffTimeout;
     private turnOffTime;
-    constructor(pInfo: DeviceInfo, type: ZigbeeDeviceType, actuatorOnSwitchID: string);
+    constructor(pInfo: DeviceInfo, type: DeviceType, actuatorOnSwitchID: string);
     update(idSplit: string[], state: ioBroker.State, initial?: boolean, handledByChildObject?: boolean): void;
     setActuator(pValue: boolean, timeout?: number, force?: boolean): void;
     toggleActuator(force?: boolean): boolean;

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

@@ -2,7 +2,6 @@ export * from './zigbeeDevice';
 export * from './ZigbeeActuator';
 export * from './zigbeeBlitzShp';
 export * from './zigbeeIlluLampe';
-export * from './zigbeeDeviceType';
 export * from './zigbeeIlluDimmer';
 export * from './zigbeeAquaraVibra';
 export * from './zigbeeAquaraWater';

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

@@ -14,7 +14,6 @@ __exportStar(require("./zigbeeDevice"), exports);
 __exportStar(require("./ZigbeeActuator"), exports);
 __exportStar(require("./zigbeeBlitzShp"), exports);
 __exportStar(require("./zigbeeIlluLampe"), exports);
-__exportStar(require("./zigbeeDeviceType"), exports);
 __exportStar(require("./zigbeeIlluDimmer"), exports);
 __exportStar(require("./zigbeeAquaraVibra"), exports);
 __exportStar(require("./zigbeeAquaraWater"), exports);

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

@@ -6,11 +6,11 @@ const log_service_1 = require("../../services/log-service");
 const persist_1 = require("../../services/dbo/persist");
 const utils_1 = require("../../services/utils/utils");
 const zigbeeDevice_1 = require("./zigbeeDevice");
-const zigbeeDeviceType_1 = require("./zigbeeDeviceType");
+const deviceType_1 = require("../deviceType");
 const CurrentIlluminationDataPoint_1 = require("../../../models/persistence/CurrentIlluminationDataPoint");
 class ZigbeeAquaraMotion extends zigbeeDevice_1.ZigbeeDevice {
     constructor(pInfo) {
-        super(pInfo, zigbeeDeviceType_1.ZigbeeDeviceType.ZigbeeAquaraMotion);
+        super(pInfo, deviceType_1.DeviceType.ZigbeeAquaraMotion);
         this.movementDetected = false;
         this.excludeFromNightAlarm = false;
         this.room = undefined;

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZigbeeAquaraVibra = void 0;
 const logLevel_1 = require("../../../models/logLevel");
 const zigbeeDevice_1 = require("./zigbeeDevice");
-const zigbeeDeviceType_1 = require("./zigbeeDeviceType");
+const deviceType_1 = require("../deviceType");
 const log_service_1 = require("../../services/log-service");
 const sonos_service_1 = require("../../services/Sonos/sonos-service");
 const utils_1 = require("../../services/utils/utils");
@@ -11,7 +11,7 @@ const polly_service_1 = require("../../services/Sonos/polly-service");
 class ZigbeeAquaraVibra extends zigbeeDevice_1.ZigbeeDevice {
     // TODO Set Sensitivity
     constructor(pInfo) {
-        super(pInfo, zigbeeDeviceType_1.ZigbeeDeviceType.ZigbeeAquaraVibra);
+        super(pInfo, deviceType_1.DeviceType.ZigbeeAquaraVibra);
         this.sensitivity = '';
         this.tiltAngle = 0;
         this.tiltAngleX = 0;

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

@@ -3,14 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZigbeeAquaraWater = void 0;
 const logLevel_1 = require("../../../models/logLevel");
 const zigbeeDevice_1 = require("./zigbeeDevice");
-const zigbeeDeviceType_1 = require("./zigbeeDeviceType");
+const deviceType_1 = require("../deviceType");
 const log_service_1 = require("../../services/log-service");
 const sonos_service_1 = require("../../services/Sonos/sonos-service");
 const utils_1 = require("../../services/utils/utils");
 const polly_service_1 = require("../../services/Sonos/polly-service");
 class ZigbeeAquaraWater extends zigbeeDevice_1.ZigbeeDevice {
     constructor(pInfo) {
-        super(pInfo, zigbeeDeviceType_1.ZigbeeDeviceType.ZigbeeAquaraWater);
+        super(pInfo, deviceType_1.DeviceType.ZigbeeAquaraWater);
         this.water = false;
         this._roomName = '';
         this.iAlarm = undefined;

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

@@ -4,11 +4,11 @@ exports.ZigbeeBlitzShp = void 0;
 const logLevel_1 = require("../../../models/logLevel");
 const log_service_1 = require("../../services/log-service");
 const zigbeeDevice_1 = require("./zigbeeDevice");
-const zigbeeDeviceType_1 = require("./zigbeeDeviceType");
+const deviceType_1 = require("../deviceType");
 const actuatorSettings_1 = require("../../../models/actuatorSettings");
 class ZigbeeBlitzShp extends zigbeeDevice_1.ZigbeeDevice {
     constructor(pInfo) {
-        super(pInfo, zigbeeDeviceType_1.ZigbeeDeviceType.ZigbeeBlitzShp);
+        super(pInfo, deviceType_1.DeviceType.ZigbeeBlitzShp);
         this.steckerOn = false;
         this.current = 0;
         this.energy = 0;

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

@@ -1,20 +1,13 @@
 /// <reference types="iobroker" />
-import { ZigbeeDeviceType } from './zigbeeDeviceType';
+import { DeviceType } from '../deviceType';
 import { DeviceInfo } from '../DeviceInfo';
-import { ZigbeeRoomSettings } from '../../../models/rooms/RoomSettings/zigbeeRoomSettings';
-import { ioBrokerBaseDevice } from '../iIoBrokerDevice';
-import { RoomBase } from '../../../models/rooms/RoomBase';
-export declare class ZigbeeDevice extends ioBrokerBaseDevice {
-    private static roomSettings;
-    room: RoomBase | undefined;
-    deviceType: ZigbeeDeviceType;
+import { IoBrokerBaseDevice } from '../IoBrokerBaseDevice';
+export declare class ZigbeeDevice extends IoBrokerBaseDevice {
     available: boolean;
     linkQuality: number;
     battery: number;
     voltage: string;
-    static addRoom(shortName: string, settings: ZigbeeRoomSettings): void;
-    static checkMissing(): void;
-    constructor(pInfo: DeviceInfo, pType: ZigbeeDeviceType);
-    protected addToCorrectRoom(): void;
+    constructor(pInfo: DeviceInfo, pType: DeviceType);
     update(idSplit: string[], state: ioBroker.State, initial?: boolean, pOverride?: boolean): void;
+    static createRespectiveDevice(zigbeeInfo: DeviceInfo): ZigbeeDevice;
 }

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

@@ -1,53 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZigbeeDevice = void 0;
+const deviceType_1 = require("../deviceType");
 const logLevel_1 = require("../../../models/logLevel");
 const log_service_1 = require("../../services/log-service");
-const iIoBrokerDevice_1 = require("../iIoBrokerDevice");
-class ZigbeeDevice extends iIoBrokerDevice_1.ioBrokerBaseDevice {
+const IoBrokerBaseDevice_1 = require("../IoBrokerBaseDevice");
+const zigbee_1 = require("../zigbee");
+class ZigbeeDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
     constructor(pInfo, pType) {
-        super(pInfo);
-        this.room = undefined;
+        super(pInfo, pType);
         this.available = false;
         this.linkQuality = 0;
         this.battery = -1;
         this.voltage = '';
-        this.deviceType = pType;
-        this.addToCorrectRoom();
-    }
-    static addRoom(shortName, settings) {
-        if (this.roomSettings[shortName] !== undefined) {
-            log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Alert, `Es gibt bereits ein Registrat für ZigbeeRoomsettings für den Raumnamen "${shortName}"`);
-            return;
-        }
-        this.roomSettings[shortName] = settings;
-    }
-    static checkMissing() {
-        for (const rName in this.roomSettings) {
-            this.roomSettings[rName].checkMissing();
-        }
-    }
-    addToCorrectRoom() {
-        const settings = ZigbeeDevice.roomSettings[this.info.room];
-        if (settings !== undefined) {
-            if (settings.devices[this.deviceType] === undefined) {
-                log_service_1.ServerLogService.missingZigbeeRoomHandling(settings.RoomName, this.deviceType);
-                return;
-            }
-            const deviceSettings = settings.devices[this.deviceType][this.info.deviceRoomIndex];
-            if (deviceSettings === undefined) {
-                log_service_1.ServerLogService.missingZigbeeRoomIndexHandling(settings.RoomName, this.info.deviceRoomIndex, this.deviceType);
-                return;
-            }
-            if (deviceSettings.customName !== undefined) {
-                this.info.customName = deviceSettings.customName;
-            }
-            deviceSettings.setID(this.info.devID);
-            deviceSettings.added = true;
-            log_service_1.ServerLogService.addedZigbeeDeviceToRoom(settings.RoomName, this.deviceType, this.info.deviceRoomIndex);
-            return;
-        }
-        log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Warn, `${this.info.room} ist noch kein bekannter Raum für Zigbee Geräte`);
     }
     update(idSplit, state, initial = false, pOverride = false) {
         log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.DeepTrace, `Zigbee: ${initial ? 'Initiales ' : ''}Update für "${this.info.customName}": ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
@@ -78,6 +43,44 @@ class ZigbeeDevice extends iIoBrokerDevice_1.ioBrokerBaseDevice {
                 break;
         }
     }
+    static createRespectiveDevice(zigbeeInfo) {
+        let d;
+        switch (zigbeeInfo.deviceType) {
+            case 'AquaraVibra':
+                d = new zigbee_1.ZigbeeAquaraVibra(zigbeeInfo);
+                break;
+            case 'AquaraMotion':
+                d = new zigbee_1.ZigbeeAquaraMotion(zigbeeInfo);
+                break;
+            case 'IkeaStecker':
+                d = new zigbee_1.ZigbeeIkeaSteckdose(zigbeeInfo);
+                break;
+            case 'LedRGBCCT':
+                d = new zigbee_1.ZigbeeIlluLedRGBCCT(zigbeeInfo);
+                break;
+            case 'IlluDimmer':
+                d = new zigbee_1.ZigbeeIlluDimmer(zigbeeInfo);
+                break;
+            case 'HeimanSmoke':
+                d = new zigbee_1.ZigbeeHeimanSmoke(zigbeeInfo);
+                break;
+            case 'AquaraWater':
+                d = new zigbee_1.ZigbeeAquaraWater(zigbeeInfo);
+                break;
+            case 'BlitzShp':
+                d = new zigbee_1.ZigbeeBlitzShp(zigbeeInfo);
+                break;
+            case 'IlluLampe':
+                d = new zigbee_1.ZigbeeIlluLampe(zigbeeInfo);
+                break;
+            case 'IlluActuator':
+                d = new zigbee_1.ZigbeeIlluActuator(zigbeeInfo);
+                break;
+            default:
+                log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Warn, `No zigbee Device Type for ${zigbeeInfo.deviceType} defined`);
+                d = new ZigbeeDevice(zigbeeInfo, deviceType_1.DeviceType.unknown);
+        }
+        return d;
+    }
 }
 exports.ZigbeeDevice = ZigbeeDevice;
-ZigbeeDevice.roomSettings = {};

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZigbeeHeimanSmoke = void 0;
 const logLevel_1 = require("../../../models/logLevel");
 const zigbeeDevice_1 = require("./zigbeeDevice");
-const zigbeeDeviceType_1 = require("./zigbeeDeviceType");
+const deviceType_1 = require("../deviceType");
 const log_service_1 = require("../../services/log-service");
 const sonos_service_1 = require("../../services/Sonos/sonos-service");
 const RoomBase_1 = require("../../../models/rooms/RoomBase");
@@ -11,7 +11,7 @@ const utils_1 = require("../../services/utils/utils");
 const polly_service_1 = require("../../services/Sonos/polly-service");
 class ZigbeeHeimanSmoke extends zigbeeDevice_1.ZigbeeDevice {
     constructor(pInfo) {
-        super(pInfo, zigbeeDeviceType_1.ZigbeeDeviceType.ZigbeeHeimanSmoke);
+        super(pInfo, deviceType_1.DeviceType.ZigbeeHeimanSmoke);
         this.smoke = false;
         this._roomName = '';
         this.iAlarm = undefined;

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZigbeeIkeaSteckdose = void 0;
 const logLevel_1 = require("../../../models/logLevel");
-const zigbeeDeviceType_1 = require("./zigbeeDeviceType");
+const deviceType_1 = require("../deviceType");
 const log_service_1 = require("../../services/log-service");
 const ZigbeeActuator_1 = require("./ZigbeeActuator");
 class ZigbeeIkeaSteckdose extends ZigbeeActuator_1.ZigbeeActuator {
@@ -10,7 +10,7 @@ class ZigbeeIkeaSteckdose extends ZigbeeActuator_1.ZigbeeActuator {
         return super.actuatorOn;
     }
     constructor(pInfo) {
-        super(pInfo, zigbeeDeviceType_1.ZigbeeDeviceType.ZigbeeIkeaSteckdose, `${pInfo.fullID}.state`);
+        super(pInfo, deviceType_1.DeviceType.ZigbeeIkeaSteckdose, `${pInfo.fullID}.state`);
     }
     update(idSplit, state, initial = false) {
         log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.DeepTrace, `Stecker Update für "${this.info.customName}": ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);

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

@@ -1,10 +1,10 @@
 /// <reference types="iobroker" />
 import { DeviceInfo } from '../DeviceInfo';
-import { ZigbeeDeviceType } from './zigbeeDeviceType';
+import { DeviceType } from '../deviceType';
 import { ZigbeeActuator } from './ZigbeeActuator';
 export declare class ZigbeeIlluActuator extends ZigbeeActuator {
     get isActuatorOn(): boolean;
-    constructor(pInfo: DeviceInfo, deviceType?: ZigbeeDeviceType);
+    constructor(pInfo: DeviceInfo, deviceType?: DeviceType);
     update(idSplit: string[], state: ioBroker.State, initial?: boolean, handledByChildObject?: boolean): void;
     setActuator(pValue: boolean, timeout?: number, force?: boolean): void;
     toggleActuator(force?: boolean): boolean;

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

@@ -2,14 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZigbeeIlluActuator = void 0;
 const logLevel_1 = require("../../../models/logLevel");
-const zigbeeDeviceType_1 = require("./zigbeeDeviceType");
+const deviceType_1 = require("../deviceType");
 const log_service_1 = require("../../services/log-service");
 const ZigbeeActuator_1 = require("./ZigbeeActuator");
 class ZigbeeIlluActuator extends ZigbeeActuator_1.ZigbeeActuator {
     get isActuatorOn() {
         return this.actuatorOn;
     }
-    constructor(pInfo, deviceType = zigbeeDeviceType_1.ZigbeeDeviceType.ZigbeeIlluActuator) {
+    constructor(pInfo, deviceType = deviceType_1.DeviceType.ZigbeeIlluActuator) {
         super(pInfo, deviceType, `${pInfo.fullID}.state`);
     }
     update(idSplit, state, initial = false, handledByChildObject = false) {

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

@@ -4,13 +4,13 @@ exports.ZigbeeIlluDimmer = void 0;
 const logLevel_1 = require("../../../models/logLevel");
 const log_service_1 = require("../../services/log-service");
 const zigbeeDevice_1 = require("./zigbeeDevice");
-const zigbeeDeviceType_1 = require("./zigbeeDeviceType");
+const deviceType_1 = require("../deviceType");
 const dimmerSettings_1 = require("../../../models/dimmerSettings");
 const time_callback_service_1 = require("../../services/time-callback-service");
 const utils_1 = require("../../services/utils/utils");
 class ZigbeeIlluDimmer extends zigbeeDevice_1.ZigbeeDevice {
     constructor(pInfo) {
-        super(pInfo, zigbeeDeviceType_1.ZigbeeDeviceType.ZigbeeIlluDimmer);
+        super(pInfo, deviceType_1.DeviceType.ZigbeeIlluDimmer);
         this.lightOn = false;
         this.queuedValue = null;
         this.brightness = 0;

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

@@ -3,14 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZigbeeIlluLampe = void 0;
 const logLevel_1 = require("../../../models/logLevel");
 const log_service_1 = require("../../services/log-service");
-const zigbeeDeviceType_1 = require("./zigbeeDeviceType");
+const deviceType_1 = require("../deviceType");
 const zigbeeIlluActuator_1 = require("./zigbeeIlluActuator");
 class ZigbeeIlluLampe extends zigbeeIlluActuator_1.ZigbeeIlluActuator {
     get lightOn() {
         return super.actuatorOn;
     }
     constructor(pInfo) {
-        super(pInfo, zigbeeDeviceType_1.ZigbeeDeviceType.ZigbeeIlluLampe);
+        super(pInfo, deviceType_1.DeviceType.ZigbeeIlluLampe);
     }
     update(idSplit, state, initial = false) {
         super.update(idSplit, state, initial, true);

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

@@ -4,13 +4,13 @@ exports.ZigbeeIlluLedRGBCCT = void 0;
 const logLevel_1 = require("../../../models/logLevel");
 const log_service_1 = require("../../services/log-service");
 const zigbeeDevice_1 = require("./zigbeeDevice");
-const zigbeeDeviceType_1 = require("./zigbeeDeviceType");
+const deviceType_1 = require("../deviceType");
 const ledSettings_1 = require("../../../models/ledSettings");
 const time_callback_service_1 = require("../../services/time-callback-service");
 class ZigbeeIlluLedRGBCCT extends zigbeeDevice_1.ZigbeeDevice {
     // private effectID: string = '';
     constructor(pInfo) {
-        super(pInfo, zigbeeDeviceType_1.ZigbeeDeviceType.ZigbeeIlluLedRGBCCT);
+        super(pInfo, deviceType_1.DeviceType.ZigbeeIlluLedRGBCCT);
         this.on = false;
         this.brightness = 0;
         this.color = '#fcba32';

package/lib/server/services/Sonos/OwnSonosDevices.js

@@ -1,8 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OwnSonosDevices = void 0;
+const logLevel_1 = require("../../../models/logLevel");
+const log_service_1 = require("../log-service");
 class OwnSonosDevices {
     static addDevice(device) {
+        log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Info, `Device ${device.name} for room "${device.roomName}" addded`);
         this.ownDevices[device.name] = device;
     }
 }

package/lib/server/services/Sonos/sonos-service.js

@@ -130,6 +130,10 @@ class SonosService {
     }
     static initializeDevice(d) {
         this.devicesDict[d.Name] = d;
+        if (this.ownDevices[d.Name] === undefined) {
+            log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Alert, `Unbekanntes Sonos Gerät "${d.Name}"`);
+            return;
+        }
         this.ownDevices[d.Name].device = d;
         log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Debug, `Sonos ${d.Uuid} für ${d.Name} gefunden`);
     }

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

@@ -7,10 +7,9 @@ const telegramMessageCalback_1 = require("./telegramMessageCalback");
 const Griffe_1 = require("../../devices/Griffe");
 const Heizgruppen_1 = require("../../devices/Heizgruppen");
 const Rollos_1 = require("../../devices/Rollos");
-const zigbeeDeviceType_1 = require("../../devices/zigbee/zigbeeDeviceType");
 const RoomBase_1 = require("../../../models/rooms/RoomBase");
 const sonos_service_1 = require("../Sonos/sonos-service");
-const hmIpDeviceType_1 = require("../../devices/hmIPDevices/hmIpDeviceType");
+const deviceType_1 = require("../../devices/deviceType");
 class TelegramCommands {
     static initialize() {
         telegram_service_1.TelegramService.addMessageCallback(new telegramMessageCalback_1.TelegramMessageCallback('AlarmStop', /\/stop_alarm/, async (m) => {
@@ -93,9 +92,9 @@ class TelegramCommands {
         telegram_service_1.TelegramService.addMessageCallback(new telegramMessageCalback_1.TelegramMessageCallback('VibrationSensitivity', /\/set_vibration_sensitivity/, async (m) => {
             if (m.from === undefined)
                 return false;
-            for (const id in devices_1.Devices.Zigbee) {
-                const d = devices_1.Devices.Zigbee[id];
-                if (d.deviceType === zigbeeDeviceType_1.ZigbeeDeviceType.ZigbeeAquaraVibra) {
+            for (const id in devices_1.Devices.alLDevices) {
+                const d = devices_1.Devices.alLDevices[id];
+                if (d.deviceType === deviceType_1.DeviceType.ZigbeeAquaraVibra) {
                     d.setSensitivity(2);
                 }
             }
@@ -106,9 +105,9 @@ class TelegramCommands {
             if (m.from === undefined)
                 return false;
             const response = ['These are the assignments for all buttons'];
-            for (const id in devices_1.Devices.hmIP) {
-                const d = devices_1.Devices.hmIP[id];
-                if (d.deviceType === hmIpDeviceType_1.HmIpDeviceType.HmIpTaster) {
+            for (const id in devices_1.Devices.alLDevices) {
+                const d = devices_1.Devices.alLDevices[id];
+                if (d.deviceType === deviceType_1.DeviceType.HmIpTaster) {
                     response.push(d.getTastenAssignment());
                 }
             }

package/lib/server/services/dbo/persist.d.ts

@@ -4,7 +4,7 @@ import { CountToday } from '../../../models/persistence/todaysCount';
 import { HmIpHeizgruppe } from '../../devices/hmIPDevices/hmIpHeizgruppe';
 import { RoomBase } from '../../../models/rooms/RoomBase';
 import { CurrentIlluminationDataPoint } from '../../../models/persistence/CurrentIlluminationDataPoint';
-import { ioBrokerBaseDevice } from '../../devices/iIoBrokerDevice';
+import { IoBrokerBaseDevice } from '../../devices/IoBrokerBaseDevice';
 export declare class Persist {
     private static TemperatureHistoryCollection;
     private static HeatGroupCollection;
@@ -17,11 +17,11 @@ export declare class Persist {
     private static Mongo;
     static addTemperaturDataPoint(hzGrp: HmIpHeizgruppe): void;
     static addRoom(room: RoomBase): void;
-    static getCount(device: ioBrokerBaseDevice): Promise<CountToday>;
+    static getCount(device: IoBrokerBaseDevice): Promise<CountToday>;
     static initialize(meteorBound: (callback: any) => void, mongo: {
         Collection: Mongo.CollectionStatic;
     }): void;
-    static persistTodayCount(device: ioBrokerBaseDevice, count: number, oldCount: number): void;
+    static persistTodayCount(device: IoBrokerBaseDevice, count: number, oldCount: number): void;
     static persistCurrentIllumination(data: CurrentIlluminationDataPoint): void;
     static readTemperaturDataPoint(hzGrp: HmIpHeizgruppe, limit?: number): Promise<TemperaturDataPoint[]>;
 }

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

@@ -1,14 +1,10 @@
-import { HmIpDeviceType } from '../devices/hmIPDevices/hmIpDeviceType';
-import { ZigbeeDeviceType } from '../devices/zigbee/zigbeeDeviceType';
+import { DeviceType } from '../devices/deviceType';
 import { LogLevel } from '../../models/logLevel';
 export declare class ServerLogService {
     static logLevel: number;
     static telegramLevel: number;
     static writeLog(pLevel: LogLevel, pMessage: string): void;
-    static addedDeviceToRoom(pRoomName: string, pDeviceType: HmIpDeviceType, pRoomIndex: number, forceDebug?: boolean): void;
-    static missingRoomHandling(pRoomName: string, pDeviceType: HmIpDeviceType): void;
-    static missingRoomIndexHandling(pRoomName: string, pIndex: number, pDeviceType: HmIpDeviceType): void;
-    static addedZigbeeDeviceToRoom(pRoomName: string, pDeviceType: ZigbeeDeviceType, pRoomIndex: number): void;
-    static missingZigbeeRoomHandling(pRoomName: string, pDeviceType: ZigbeeDeviceType): void;
-    static missingZigbeeRoomIndexHandling(pRoomName: string, pIndex: number, pDeviceType: ZigbeeDeviceType): void;
+    static addedDeviceToRoom(pRoomName: string, pDeviceType: DeviceType, pRoomIndex: number, forceDebug?: boolean): void;
+    static missingRoomHandling(pRoomName: string, pDeviceType: DeviceType): void;
+    static missingRoomIndexHandling(pRoomName: string, pIndex: number, pDeviceType: DeviceType): void;
 }

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

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ServerLogService = void 0;
-const hmIpDeviceType_1 = require("../devices/hmIPDevices/hmIpDeviceType");
-const zigbeeDeviceType_1 = require("../devices/zigbee/zigbeeDeviceType");
+const deviceType_1 = require("../devices/deviceType");
 const telegram_service_1 = require("./Telegram/telegram-service");
 const logLevel_1 = require("../../models/logLevel");
 class ServerLogService {
@@ -18,22 +17,13 @@ class ServerLogService {
     }
     static addedDeviceToRoom(pRoomName, pDeviceType, pRoomIndex, forceDebug = false) {
         const logLevel = forceDebug ? logLevel_1.LogLevel.Debug : logLevel_1.LogLevel.Trace;
-        ServerLogService.writeLog(logLevel, `${hmIpDeviceType_1.HmIpDeviceType[pDeviceType]} (Raumindex: ${pRoomIndex}) zum Raum "${pRoomName}" hinzugefügt"`);
+        ServerLogService.writeLog(logLevel, `${deviceType_1.DeviceType[pDeviceType]} (Raumindex: ${pRoomIndex}) zum Raum "${pRoomName}" hinzugefügt"`);
     }
     static missingRoomHandling(pRoomName, pDeviceType) {
-        ServerLogService.writeLog(logLevel_1.LogLevel.Warn, `Raum "${pRoomName}" hat keine Definition für den Typ "${hmIpDeviceType_1.HmIpDeviceType[pDeviceType]}"`);
+        ServerLogService.writeLog(logLevel_1.LogLevel.Warn, `Raum "${pRoomName}" hat keine Definition für den Typ "${deviceType_1.DeviceType[pDeviceType]}"`);
     }
     static missingRoomIndexHandling(pRoomName, pIndex, pDeviceType) {
-        ServerLogService.writeLog(logLevel_1.LogLevel.Warn, `Raum "${pRoomName}" hat keine Definition für den Typ "${hmIpDeviceType_1.HmIpDeviceType[pDeviceType]} mit Index ${pIndex}"`);
-    }
-    static addedZigbeeDeviceToRoom(pRoomName, pDeviceType, pRoomIndex) {
-        ServerLogService.writeLog(logLevel_1.LogLevel.Trace, `${zigbeeDeviceType_1.ZigbeeDeviceType[pDeviceType]} (Raumindex: ${pRoomIndex}) zum Raum "${pRoomName}" hinzugefügt"`);
-    }
-    static missingZigbeeRoomHandling(pRoomName, pDeviceType) {
-        ServerLogService.writeLog(logLevel_1.LogLevel.Warn, `Raum "${pRoomName}" hat keine Definition für den Zigbee Typ "${zigbeeDeviceType_1.ZigbeeDeviceType[pDeviceType]}"`);
-    }
-    static missingZigbeeRoomIndexHandling(pRoomName, pIndex, pDeviceType) {
-        ServerLogService.writeLog(logLevel_1.LogLevel.Warn, `Raum "${pRoomName}" hat keine Definition für den Typ "${zigbeeDeviceType_1.ZigbeeDeviceType[pDeviceType]} mit Index ${pIndex}"`);
+        ServerLogService.writeLog(logLevel_1.LogLevel.Warn, `Raum "${pRoomName}" hat keine Definition für den Typ "${deviceType_1.DeviceType[pDeviceType]} mit Index ${pIndex}"`);
     }
 }
 exports.ServerLogService = ServerLogService;