hoffmation-base 0.1.22 → 0.1.26

package/lib/models/rooms/RoomBase.d.ts

@@ -9,7 +9,7 @@ import { RoomSettings } from './RoomSettings/RoomSettings';
 import { SmokeGroup } from '../../server/devices/groups/smokeGroup';
 import { FensterGroup } from '../../server/devices/groups/fensterGroup';
 import { SonosGroup } from '../../server/devices/groups/sonosGroup';
-import { ioBrokerBaseDevice } from '../../server/devices/iIoBrokerDevice';
+import { IoBrokerBaseDevice } from '../../server/devices/IoBrokerBaseDevice';
 import { RoomInitializationSettings } from './RoomSettings/RoomInitializationSettings';
 export declare class RoomBase {
     roomName: string;
@@ -62,7 +62,7 @@ export declare class RoomBase {
     static clearAllAlarms(): void;
     static startAwayMode(): void;
     static startNightAlarmMode(): void;
-    static startIntrusionAlarm(room: RoomBase, device: ioBrokerBaseDevice): void;
+    static startIntrusionAlarm(room: RoomBase, device: IoBrokerBaseDevice): void;
     static endAlarmModes(): void;
     static getLastMovements(): string;
     constructor(roomName: string, Einstellungen: RoomSettings);

package/lib/models/rooms/RoomBase.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RoomBase = void 0;
-const hmIpDevice_1 = require("../../server/devices/hmIPDevices/hmIpDevice");
 const tasterGroup_1 = require("../../server/devices/groups/tasterGroup");
 const praesenzGroup_1 = require("../../server/devices/groups/praesenzGroup");
 const ringstorage_1 = require("../../server/services/utils/ringstorage");
@@ -14,11 +13,11 @@ const utils_1 = require("../../server/services/utils/utils");
 const lampenGroup_1 = require("../../server/devices/groups/lampenGroup");
 const smokeGroup_1 = require("../../server/devices/groups/smokeGroup");
 const fensterGroup_1 = require("../../server/devices/groups/fensterGroup");
-const zigbeeDevice_1 = require("../../server/devices/zigbee/zigbeeDevice");
 const persist_1 = require("../../server/services/dbo/persist");
 const time_callback_service_1 = require("../../server/services/time-callback-service");
 const sonos_service_1 = require("../../server/services/Sonos/sonos-service");
 const sonosGroup_1 = require("../../server/devices/groups/sonosGroup");
+const IoBrokerBaseDevice_1 = require("../../server/devices/IoBrokerBaseDevice");
 class RoomBase {
     constructor(roomName, Einstellungen) {
         this.roomName = roomName;
@@ -44,11 +43,8 @@ class RoomBase {
         RoomBase.allRooms.push(this);
     }
     static registerRoomForDevices(roomInitializationSettings) {
-        if (roomInitializationSettings.hmIpSettings !== undefined) {
-            hmIpDevice_1.HmIPDevice.addRoom(roomInitializationSettings.shortName, roomInitializationSettings.hmIpSettings);
-        }
-        if (roomInitializationSettings.zigbeeSettings !== undefined) {
-            zigbeeDevice_1.ZigbeeDevice.addRoom(roomInitializationSettings.shortName, roomInitializationSettings.zigbeeSettings);
+        if (roomInitializationSettings.deviceAddidngSettings !== undefined) {
+            IoBrokerBaseDevice_1.IoBrokerBaseDevice.addRoom(roomInitializationSettings.shortName, roomInitializationSettings.deviceAddidngSettings);
         }
     }
     static addToRoomList(room) {

package/lib/models/rooms/RoomSettings/RoomInitializationSettings.d.ts

@@ -1,10 +1,8 @@
-import { HmIpRoomSettings } from './hmIPRoomSettings';
-import { ZigbeeRoomSettings } from './zigbeeRoomSettings';
+import { RoomDeviceAddingSettings } from './roomDeviceAddingSettings';
 import { iRoomInitializationSettings } from './iRoomInitializationSettings';
 export declare class RoomInitializationSettings implements iRoomInitializationSettings {
     shortName: string;
     etage: number;
     constructor(shortName: string, etage?: number);
-    hmIpSettings?: HmIpRoomSettings;
-    zigbeeSettings?: ZigbeeRoomSettings;
+    deviceAddidngSettings?: RoomDeviceAddingSettings;
 }

package/lib/models/rooms/RoomSettings/RoomSettings.d.ts

@@ -1,10 +1,9 @@
-import { HmIpRoomSettings } from './hmIPRoomSettings';
-import { ZigbeeRoomSettings } from './zigbeeRoomSettings';
+import { RoomDeviceAddingSettings } from './roomDeviceAddingSettings';
 import { iRoomDefaultSettings } from './iRoomDefaultSettings';
 import { SunTimeOffsets } from '../../../server/services/time-callback-service';
 import { RoomBase } from '../RoomBase';
 import { iTimePair } from '../../../server/config/iConfig';
-import { iRoomInitializationSettings } from '/server/config/private/src/models/rooms/RoomSettings/iRoomInitializationSettings';
+import { iRoomInitializationSettings } from './iRoomInitializationSettings';
 export declare class RoomSettings implements iRoomDefaultSettings, iRoomInitializationSettings {
     shortName: string;
     defaultSettings: iRoomDefaultSettings;
@@ -20,8 +19,7 @@ export declare class RoomSettings implements iRoomDefaultSettings, iRoomInitiali
     private _sonnenAufgangRolloMinTime;
     private _sonnenAufgangLampenDelay;
     private _lightIfNoWindows;
-    hmIpSettings?: HmIpRoomSettings;
-    zigbeeSettings?: ZigbeeRoomSettings;
+    deviceAddidngSettings?: RoomDeviceAddingSettings;
     radioUrl: string;
     etage: number;
     rolloOffset: SunTimeOffsets;

package/lib/models/rooms/RoomSettings/RoomSettings.js

@@ -23,8 +23,7 @@ class RoomSettings {
         this.rolloHeatReduction = this.defaultSettings.rolloHeatReduction;
         this.shortName = initSettings.shortName;
         this.etage = initSettings.etage;
-        this.hmIpSettings = initSettings.hmIpSettings;
-        this.zigbeeSettings = initSettings.zigbeeSettings;
+        this.deviceAddidngSettings = initSettings.deviceAddidngSettings;
         this.rolloOffset = new time_callback_service_1.SunTimeOffsets(this.sonnenAufgangRolloDelay, this.sonnenUntergangRolloDelay, this.sonnenAufgangRolloMinTime.hours, this.sonnenAufgangRolloMinTime.minutes, this.sonnenUntergangRolloMaxTime.hours, this.sonnenUntergangRolloMaxTime.minutes);
         this.lampOffset = new time_callback_service_1.SunTimeOffsets(this.sonnenAufgangLampenDelay, this.sonnenUntergangLampenDelay);
     }

package/lib/models/rooms/RoomSettings/iRoomInitializationSettings.d.ts

@@ -1,7 +1,6 @@
-import { HmIpRoomSettings, ZigbeeRoomSettings } from '../index';
+import { RoomDeviceAddingSettings } from './roomDeviceAddingSettings';
 export interface iRoomInitializationSettings {
-    hmIpSettings?: HmIpRoomSettings;
-    zigbeeSettings?: ZigbeeRoomSettings;
+    deviceAddidngSettings?: RoomDeviceAddingSettings;
     etage: number;
     shortName: string;
 }

package/lib/models/rooms/RoomSettings/index.d.ts

@@ -1,6 +1,6 @@
 export * from './RoomSettings';
-export * from './hmIPRoomSettings';
-export * from './zigbeeRoomSettings';
+export * from './roomDeviceAddingSettings';
 export * from './iRoomDefaultSettings';
 export * from './iRoomInitializationSettings';
 export * from './RoomInitializationSettings';
+export * from './roomAddDeviceItem';

package/lib/models/rooms/RoomSettings/index.js

@@ -11,8 +11,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./RoomSettings"), exports);
-__exportStar(require("./hmIPRoomSettings"), exports);
-__exportStar(require("./zigbeeRoomSettings"), exports);
+__exportStar(require("./roomDeviceAddingSettings"), exports);
 __exportStar(require("./iRoomDefaultSettings"), exports);
 __exportStar(require("./iRoomInitializationSettings"), exports);
 __exportStar(require("./RoomInitializationSettings"), exports);
+__exportStar(require("./roomAddDeviceItem"), exports);

package/lib/models/rooms/RoomSettings/roomAddDeviceItem.d.ts

@@ -0,0 +1,10 @@
+import { RoomBase } from '../RoomBase';
+export declare class RoomAddDeviceItem {
+    setID: (value: string) => RoomBase;
+    index: number;
+    customName: string;
+    private _added;
+    get added(): boolean;
+    set added(value: boolean);
+    constructor(setID: (value: string) => RoomBase, index: number, customName: string);
+}

package/lib/models/rooms/RoomSettings/roomAddDeviceItem.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RoomAddDeviceItem = void 0;
+const logLevel_1 = require("../../logLevel");
+const log_service_1 = require("../../../server/services/log-service");
+class RoomAddDeviceItem {
+    constructor(setID, index, customName) {
+        this.setID = setID;
+        this.index = index;
+        this.customName = customName;
+        this._added = false;
+    }
+    get added() {
+        return this._added;
+    }
+    set added(value) {
+        if (this._added) {
+            log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Error, `${this.customName} Added twice`);
+        }
+        this._added = value;
+    }
+}
+exports.RoomAddDeviceItem = RoomAddDeviceItem;

package/lib/models/rooms/RoomSettings/roomDeviceAddingSettings.d.ts

@@ -0,0 +1,10 @@
+import { RoomAddDeviceItem } from './roomAddDeviceItem';
+import { DeviceType } from '../../../server';
+import { RoomBase } from '../RoomBase';
+export declare class RoomDeviceAddingSettings {
+    RoomName: string;
+    devices: Array<Array<RoomAddDeviceItem>>;
+    constructor(RoomName: string);
+    addDevice(deviceType: DeviceType, setID: (value: string) => RoomBase, index: number, customName?: string | undefined): void;
+    checkMissing(): void;
+}

package/lib/models/rooms/RoomSettings/roomDeviceAddingSettings.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RoomDeviceAddingSettings = void 0;
+const logLevel_1 = require("../../logLevel");
+const roomAddDeviceItem_1 = require("./roomAddDeviceItem");
+const server_1 = require("../../../server");
+class RoomDeviceAddingSettings {
+    constructor(RoomName) {
+        this.RoomName = RoomName;
+        this.devices = [];
+    }
+    addDevice(deviceType, setID, index, customName = undefined) {
+        if (this.devices[deviceType] === undefined) {
+            this.devices[deviceType] = [];
+        }
+        if (customName === undefined) {
+            customName = `${this.RoomName} ${server_1.DeviceType[deviceType]}`;
+        }
+        this.devices[deviceType][index] = new roomAddDeviceItem_1.RoomAddDeviceItem(setID, index, customName);
+    }
+    checkMissing() {
+        for (const type in this.devices) {
+            const devs = this.devices[type];
+            for (const index in devs) {
+                const dev = devs[index];
+                if (!dev.added) {
+                    server_1.ServerLogService.writeLog(logLevel_1.LogLevel.Error, `${dev.customName} fehlt in der Device JSON`);
+                }
+            }
+        }
+    }
+}
+exports.RoomDeviceAddingSettings = RoomDeviceAddingSettings;

package/lib/server/devices/Griffe.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Griffe = void 0;
 const devices_1 = require("./devices");
 const FensterPosition_1 = require("./hmIPDevices/FensterPosition");
-const hmIpDeviceType_1 = require("./hmIPDevices/hmIpDeviceType");
+const deviceType_1 = require("./deviceType");
 class Griffe {
     static getGriffPosition() {
         const griffe = Griffe.getAllGriffe();
@@ -19,9 +19,9 @@ class Griffe {
     }
     static getAllGriffe() {
         const griffe = [];
-        for (const dID in devices_1.Devices.hmIP) {
-            const d = devices_1.Devices.hmIP[dID];
-            if (d.deviceType === hmIpDeviceType_1.HmIpDeviceType.HmIpGriff) {
+        for (const dID in devices_1.Devices.alLDevices) {
+            const d = devices_1.Devices.alLDevices[dID];
+            if (d.deviceType === deviceType_1.DeviceType.HmIpGriff) {
                 griffe.push(d);
             }
         }

package/lib/server/devices/Heizgruppen.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Heizgruppen = void 0;
 const persist_1 = require("../services/dbo/persist");
 const devices_1 = require("./devices");
-const hmIpDeviceType_1 = require("./hmIPDevices/hmIpDeviceType");
+const deviceType_1 = require("./deviceType");
 class Heizgruppen {
     static getInfo() {
         const gruppen = Heizgruppen.getAllGruppen();
@@ -57,18 +57,18 @@ class Heizgruppen {
     }
     static getAllGruppen() {
         const gruppen = [];
-        for (const dID in devices_1.Devices.hmIP) {
-            const d = devices_1.Devices.hmIP[dID];
-            if (d.deviceType === hmIpDeviceType_1.HmIpDeviceType.HmIpHeizgruppe) {
+        for (const dID in devices_1.Devices.alLDevices) {
+            const d = devices_1.Devices.alLDevices[dID];
+            if (d.deviceType === deviceType_1.DeviceType.HmIpHeizgruppe) {
                 gruppen.push(d);
             }
         }
         return gruppen;
     }
     static getSpecificGroup(name) {
-        for (const dID in devices_1.Devices.hmIP) {
-            const d = devices_1.Devices.hmIP[dID];
-            if (d.deviceType === hmIpDeviceType_1.HmIpDeviceType.HmIpHeizgruppe && d.info.customName === name) {
+        for (const dID in devices_1.Devices.alLDevices) {
+            const d = devices_1.Devices.alLDevices[dID];
+            if (d.deviceType === deviceType_1.DeviceType.HmIpHeizgruppe && d.info.customName === name) {
                 return d;
             }
         }

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

@@ -0,0 +1,41 @@
+/// <reference types="iobroker" />
+import { DeviceInfo } from './DeviceInfo';
+import { DeviceType } from './deviceType';
+import { IOBrokerConnection } from '../ioBroker/connection';
+import { RoomDeviceAddingSettings } from '../../models/rooms/RoomSettings/roomDeviceAddingSettings';
+import { RoomBase } from '../../models';
+export declare abstract class IoBrokerBaseDevice {
+    protected _info: DeviceInfo;
+    deviceType: DeviceType;
+    static roomAddingSettings: {
+        [id: string]: RoomDeviceAddingSettings;
+    };
+    static addRoom(shortName: string, settings: RoomDeviceAddingSettings): void;
+    static checkMissing(): void;
+    room: RoomBase | undefined;
+    allDevicesKey: string;
+    protected _ioConnection?: IOBrokerConnection;
+    protected constructor(_info: DeviceInfo, deviceType: DeviceType);
+    /**
+     * Getter info
+     * @return {TradFriInfo}
+     */
+    get info(): DeviceInfo;
+    /**
+     * Setter info
+     * @param {TradFriInfo} value
+     */
+    set info(value: DeviceInfo);
+    /**
+     * Getter ioConn
+     * @return {IOBrokerConnection}
+     */
+    get ioConn(): IOBrokerConnection | undefined;
+    /**
+     * Setter ioConn
+     * @param {IOBrokerConnection} value
+     */
+    set ioConn(value: IOBrokerConnection | undefined);
+    abstract update(idSplit: string[], state: ioBroker.State, initial: boolean, pOverride: boolean): void;
+    protected addToCorrectRoom(): void;
+}

package/lib/server/devices/IoBrokerBaseDevice.js

@@ -0,0 +1,78 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.IoBrokerBaseDevice = void 0;
+const logLevel_1 = require("../../models/logLevel");
+const log_service_1 = require("../services/log-service");
+class IoBrokerBaseDevice {
+    constructor(_info, deviceType) {
+        this._info = _info;
+        this.deviceType = deviceType;
+        this.room = undefined;
+        this.allDevicesKey = '';
+        this.addToCorrectRoom();
+    }
+    static addRoom(shortName, settings) {
+        if (this.roomAddingSettings[shortName] !== undefined) {
+            log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Alert, `Es gibt bereits ein Registrat für HmIpRoomsettings für den Raumnamen "${shortName}"`);
+            return;
+        }
+        this.roomAddingSettings[shortName] = settings;
+    }
+    static checkMissing() {
+        for (const rName in this.roomAddingSettings) {
+            this.roomAddingSettings[rName].checkMissing();
+        }
+    }
+    /**
+     * Getter info
+     * @return {TradFriInfo}
+     */
+    get info() {
+        return this._info;
+    }
+    /**
+     * Setter info
+     * @param {TradFriInfo} 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() {
+        const settings = IoBrokerBaseDevice.roomAddingSettings[this.info.room];
+        if (settings !== undefined) {
+            if (settings.devices[this.deviceType] === undefined) {
+                log_service_1.ServerLogService.missingRoomHandling(settings.RoomName, this.deviceType);
+                return;
+            }
+            const deviceSettings = settings.devices[this.deviceType][this.info.deviceRoomIndex];
+            if (deviceSettings === undefined) {
+                log_service_1.ServerLogService.missingRoomIndexHandling(settings.RoomName, this.info.deviceRoomIndex, this.deviceType);
+                return;
+            }
+            if (deviceSettings.customName !== undefined) {
+                this.info.customName = deviceSettings.customName;
+            }
+            this.room = deviceSettings.setID(this.info.devID);
+            deviceSettings.added = true;
+            log_service_1.ServerLogService.addedDeviceToRoom(settings.RoomName, this.deviceType, this.info.deviceRoomIndex);
+            return;
+        }
+        log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Warn, `${this.info.room} is noch kein bekannter Raum`);
+    }
+}
+exports.IoBrokerBaseDevice = IoBrokerBaseDevice;
+IoBrokerBaseDevice.roomAddingSettings = {};

package/lib/server/devices/Rollos.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Rolladen = void 0;
 const devices_1 = require("./devices");
-const hmIpDeviceType_1 = require("./hmIPDevices/hmIpDeviceType");
+const deviceType_1 = require("./deviceType");
 const RoomBase_1 = require("../../models/rooms/RoomBase");
 class Rolladen {
     static getRolladenPosition() {
@@ -31,9 +31,9 @@ class Rolladen {
     }
     static getAllRollos() {
         const rollos = [];
-        for (const dID in devices_1.Devices.hmIP) {
-            const d = devices_1.Devices.hmIP[dID];
-            if (d.deviceType === hmIpDeviceType_1.HmIpDeviceType.HmIpRoll) {
+        for (const dID in devices_1.Devices.alLDevices) {
+            const d = devices_1.Devices.alLDevices[dID];
+            if (d.deviceType === deviceType_1.DeviceType.HmIpRoll) {
                 rollos.push(d);
             }
         }

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

@@ -0,0 +1,26 @@
+export declare enum DeviceType {
+    unknown = 0,
+    HmIpLampe = 101,
+    HmIpTaster = 102,
+    HmIpRoll = 103,
+    HmIpTherm = 104,
+    HmIpPraezenz = 105,
+    HmIpGriff = 106,
+    HmIpWippe = 107,
+    HmIpHeizung = 108,
+    HmIpTuer = 109,
+    HmIpHeizgruppe = 110,
+    HmIpBewegung = 111,
+    ZigbeeIkeaFernbedienung = 201,
+    ZigbeeIkeaSteckdose = 202,
+    ZigbeeIlluLedRGBCCT = 203,
+    ZigbeeAquaraVibra = 204,
+    ZigbeeIlluDimmer = 205,
+    ZigbeeHeimanSmoke = 206,
+    ZigbeeAquaraWater = 207,
+    ZigbeeBlitzShp = 208,
+    ZigbeeIlluLampe = 209,
+    ZigbeeIlluActuator = 210,
+    ZigbeeAquaraMotion = 211,
+    Wled = 1001
+}

package/lib/server/devices/deviceType.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DeviceType = void 0;
+var DeviceType;
+(function (DeviceType) {
+    DeviceType[DeviceType["unknown"] = 0] = "unknown";
+    DeviceType[DeviceType["HmIpLampe"] = 101] = "HmIpLampe";
+    DeviceType[DeviceType["HmIpTaster"] = 102] = "HmIpTaster";
+    DeviceType[DeviceType["HmIpRoll"] = 103] = "HmIpRoll";
+    DeviceType[DeviceType["HmIpTherm"] = 104] = "HmIpTherm";
+    DeviceType[DeviceType["HmIpPraezenz"] = 105] = "HmIpPraezenz";
+    DeviceType[DeviceType["HmIpGriff"] = 106] = "HmIpGriff";
+    DeviceType[DeviceType["HmIpWippe"] = 107] = "HmIpWippe";
+    DeviceType[DeviceType["HmIpHeizung"] = 108] = "HmIpHeizung";
+    DeviceType[DeviceType["HmIpTuer"] = 109] = "HmIpTuer";
+    DeviceType[DeviceType["HmIpHeizgruppe"] = 110] = "HmIpHeizgruppe";
+    DeviceType[DeviceType["HmIpBewegung"] = 111] = "HmIpBewegung";
+    DeviceType[DeviceType["ZigbeeIkeaFernbedienung"] = 201] = "ZigbeeIkeaFernbedienung";
+    DeviceType[DeviceType["ZigbeeIkeaSteckdose"] = 202] = "ZigbeeIkeaSteckdose";
+    DeviceType[DeviceType["ZigbeeIlluLedRGBCCT"] = 203] = "ZigbeeIlluLedRGBCCT";
+    DeviceType[DeviceType["ZigbeeAquaraVibra"] = 204] = "ZigbeeAquaraVibra";
+    DeviceType[DeviceType["ZigbeeIlluDimmer"] = 205] = "ZigbeeIlluDimmer";
+    DeviceType[DeviceType["ZigbeeHeimanSmoke"] = 206] = "ZigbeeHeimanSmoke";
+    DeviceType[DeviceType["ZigbeeAquaraWater"] = 207] = "ZigbeeAquaraWater";
+    DeviceType[DeviceType["ZigbeeBlitzShp"] = 208] = "ZigbeeBlitzShp";
+    DeviceType[DeviceType["ZigbeeIlluLampe"] = 209] = "ZigbeeIlluLampe";
+    DeviceType[DeviceType["ZigbeeIlluActuator"] = 210] = "ZigbeeIlluActuator";
+    DeviceType[DeviceType["ZigbeeAquaraMotion"] = 211] = "ZigbeeAquaraMotion";
+    DeviceType[DeviceType["Wled"] = 1001] = "Wled";
+})(DeviceType = exports.DeviceType || (exports.DeviceType = {}));

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

@@ -2,12 +2,8 @@
 import { Devices } from './devices';
 import { IDeviceUpdater } from './iDeviceUpdater';
 export declare class DeviceUpdater implements IDeviceUpdater {
-    private static IDENTIFIER_HOMEMATIC;
-    private static IDENTIFIER_ZIGBEE;
     devices: Devices;
     constructor(pDevices: Devices);
     updateObject(pId: string, pObj: ioBroker.Object): void;
     updateState(id: string, state: ioBroker.State, initial?: boolean): void;
-    private updateHomeMaticDevice;
-    private updateZigbeeDevice;
 }

package/lib/server/devices/deviceUpdater.js

@@ -12,7 +12,7 @@ class DeviceUpdater {
         const idSplit = pId.split('.');
         if (idSplit.length < 2)
             return;
-        if (idSplit[0] === DeviceUpdater.IDENTIFIER_HOMEMATIC) {
+        if (idSplit[0] === devices_1.Devices.IDENTIFIER_HOMEMATIC) {
             console.log(`Neuer Wert in HomematicIP für ${pId}: ${JSON.stringify(pObj)}`);
         }
     }
@@ -24,41 +24,16 @@ class DeviceUpdater {
         const idSplit = id.split('.');
         if (idSplit.length < 2)
             return;
-        if (idSplit[0] === DeviceUpdater.IDENTIFIER_HOMEMATIC) {
-            try {
-                this.updateHomeMaticDevice(idSplit, state, initial);
-            }
-            catch (e) {
-                log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Alert, `deviceUpdater.updateState('${id}', '${state}'): Error occured updating Device: ${e} \n ${e.stack}`);
-            }
-        }
-        else if (idSplit[0] === DeviceUpdater.IDENTIFIER_ZIGBEE) {
-            try {
-                this.updateZigbeeDevice(idSplit, state, initial);
-            }
-            catch (e) {
-                log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Alert, `deviceUpdater.updateState('${id}', '${state}'): Error occured updating Device: ${e} \n ${e.stack}`);
-            }
-        }
-        else {
-            log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.DeepTrace, `unbekannter Identifier: "${idSplit[0]}"`);
-        }
-    }
-    updateHomeMaticDevice(idSplit, state, initial = false) {
-        const device = devices_1.Devices.hmIP[idSplit[2]];
+        const device = devices_1.Devices.alLDevices[`${idSplit[0]}-${idSplit[2]}`];
         if (typeof device === 'undefined') {
             return;
         }
-        device.update(idSplit, state, initial);
-    }
-    updateZigbeeDevice(idSplit, state, initial = false) {
-        const device = devices_1.Devices.Zigbee[idSplit[2]];
-        if (typeof device === 'undefined') {
-            return;
+        try {
+            device.update(idSplit, state, initial, false);
+        }
+        catch (e) {
+            log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Alert, `deviceUpdater.updateState('${id}', '${state}'): Error occured updating Device: ${e} \n ${e.stack}`);
         }
-        device.update(idSplit, state, initial);
     }
 }
 exports.DeviceUpdater = DeviceUpdater;
-DeviceUpdater.IDENTIFIER_HOMEMATIC = 'hm-rpc';
-DeviceUpdater.IDENTIFIER_ZIGBEE = 'zigbee';

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

@@ -1,14 +1,12 @@
 import { IOBrokerConnection } from '../ioBroker/connection';
-import { HmIPDevice } from './hmIPDevices/hmIpDevice';
-import { ZigbeeDevice } from './zigbee/zigbeeDevice';
 import { deviceConfig } from '../../models/deviceConfig';
 import { iRoomImportEnforcer } from '../../models/rooms/iRoomImportEnforcer';
+import { IoBrokerBaseDevice } from './IoBrokerBaseDevice';
 export declare class Devices {
-    static hmIP: {
-        [id: string]: HmIPDevice;
-    };
-    static Zigbee: {
-        [id: string]: ZigbeeDevice;
+    static IDENTIFIER_HOMEMATIC: string;
+    static IDENTIFIER_ZIGBEE: string;
+    static alLDevices: {
+        [id: string]: IoBrokerBaseDevice;
     };
     constructor(pDeviceData: {
         [id: string]: deviceConfig;