hoffmation-base 0.1.40 → 0.1.41-12

package/lib/index.d.ts

@@ -1,11 +1,10 @@
-import { Devices, iConfig, ioBrokerMain, OwnSonosDevice, iPersist } from './server';
+import { Devices, iConfig, ioBrokerMain, OwnSonosDevice } from './server';
 export * from './models/index';
 export * from './server/index';
 export declare class HoffmationInitializationObject {
     config: iConfig;
     constructor(config: iConfig);
 }
-export declare let dbo: iPersist | undefined;
 export declare class HoffmationBase {
     static ioMain: ioBrokerMain;
     static initializeBeforeIoBroker(initObject: HoffmationInitializationObject): Promise<void>;

package/lib/index.js

@@ -14,7 +14,7 @@ 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 });
-exports.HoffmationBase = exports.dbo = exports.HoffmationInitializationObject = void 0;
+exports.HoffmationBase = exports.HoffmationInitializationObject = void 0;
 const models_1 = require("./models");
 const server_1 = require("./server");
 __exportStar(require("./models/index"), exports);
@@ -27,6 +27,7 @@ class HoffmationInitializationObject {
 exports.HoffmationInitializationObject = HoffmationInitializationObject;
 class HoffmationBase {
     static async initializeBeforeIoBroker(initObject) {
+        var _a;
         server_1.SettingsService.initialize(initObject.config);
         server_1.Res.initialize(initObject.config.translationSettings);
         if (initObject.config.logSettings) {
@@ -35,12 +36,12 @@ class HoffmationBase {
         server_1.ServerLogService.writeLog(models_1.LogLevel.Info, `Hoffmation-Base Startup`);
         if (initObject.config.persistence) {
             if (initObject.config.persistence.mongo) {
-                exports.dbo = new server_1.MongoPersistance(initObject.config.persistence);
+                server_1.Utils.dbo = new server_1.MongoPersistance(initObject.config.persistence);
             }
             else if (initObject.config.persistence.postgreSql) {
-                exports.dbo = new server_1.PostgreSqlPersist(initObject.config.persistence);
+                server_1.Utils.dbo = new server_1.PostgreSqlPersist(initObject.config.persistence);
             }
-            await (exports.dbo === null || exports.dbo === void 0 ? void 0 : exports.dbo.initialize());
+            await ((_a = server_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.initialize());
         }
         if (server_1.SettingsService.settings.mp3Server) {
             server_1.ServerLogService.writeLog(models_1.LogLevel.Info, `Mp3Server settings detected --> initializing`);

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

@@ -3,4 +3,15 @@ export declare class ActuatorSettings extends DeviceSettings {
     dawnOn: boolean;
     duskOn: boolean;
     nightOn: boolean;
+    /**
+     * Indicates if this device controls e.g. an Eltako, which has it's own Turn Off Time logic.
+     * @type {boolean}
+     */
+    isStromStoss: boolean;
+    /**
+     * If this is an Actuator controling a time based relais,
+     * this indicates the time after which we retrigger the relais.
+     * @type {number}
+     */
+    stromStossResendTime: number;
 }

package/lib/models/deviceSettings/actuatorSettings.js

@@ -8,6 +8,17 @@ class ActuatorSettings extends deviceSettings_1.DeviceSettings {
         this.dawnOn = true;
         this.duskOn = true;
         this.nightOn = true;
+        /**
+         * Indicates if this device controls e.g. an Eltako, which has it's own Turn Off Time logic.
+         * @type {boolean}
+         */
+        this.isStromStoss = false;
+        /**
+         * If this is an Actuator controling a time based relais,
+         * this indicates the time after which we retrigger the relais.
+         * @type {number}
+         */
+        this.stromStossResendTime = 180;
     }
 }
 exports.ActuatorSettings = ActuatorSettings;

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

@@ -2,4 +2,5 @@ export * from './actuatorSettings';
 export * from './deviceSettings';
 export * from './dimmerSettings';
 export * from './ledSettings';
+export * from './motionSensorSettings';
 export * from './shutterSettings';

package/lib/models/deviceSettings/index.js

@@ -18,4 +18,5 @@ __exportStar(require("./actuatorSettings"), exports);
 __exportStar(require("./deviceSettings"), exports);
 __exportStar(require("./dimmerSettings"), exports);
 __exportStar(require("./ledSettings"), exports);
+__exportStar(require("./motionSensorSettings"), exports);
 __exportStar(require("./shutterSettings"), exports);

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

@@ -0,0 +1,9 @@
+import { DeviceSettings } from './deviceSettings';
+export declare class MotionSensorSettings extends DeviceSettings {
+    /**
+     * If set to false, a detected movement on this sensor will block certain alarms on windows in this room
+     * @type {boolean}
+     */
+    seesWindow: boolean;
+    excludeFromNightAlarm: boolean;
+}

package/lib/models/deviceSettings/motionSensorSettings.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MotionSensorSettings = void 0;
+const deviceSettings_1 = require("./deviceSettings");
+class MotionSensorSettings extends deviceSettings_1.DeviceSettings {
+    constructor() {
+        super(...arguments);
+        /**
+         * If set to false, a detected movement on this sensor will block certain alarms on windows in this room
+         * @type {boolean}
+         */
+        this.seesWindow = true;
+        this.excludeFromNightAlarm = false;
+    }
+}
+exports.MotionSensorSettings = MotionSensorSettings;

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

@@ -2,4 +2,10 @@ import { DeviceSettings } from './deviceSettings';
 export declare class ShutterSettings extends DeviceSettings {
     msTilTop: number;
     msTilBot: number;
+    /**
+     * Some shutter give no position feedback on their own, so by knowing the durations in either direction,
+     * we can programmatically trigger the callbacks.
+     * @type {boolean}
+     */
+    triggerPositionUpdateByTime: boolean;
 }

package/lib/models/deviceSettings/shutterSettings.js

@@ -7,6 +7,12 @@ class ShutterSettings extends deviceSettings_1.DeviceSettings {
         super(...arguments);
         this.msTilTop = -1;
         this.msTilBot = -1;
+        /**
+         * Some shutter give no position feedback on their own, so by knowing the durations in either direction,
+         * we can programmatically trigger the callbacks.
+         * @type {boolean}
+         */
+        this.triggerPositionUpdateByTime = false;
     }
 }
 exports.ShutterSettings = ShutterSettings;

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

@@ -1,22 +1,17 @@
 import { TimeCallback } from '../timeCallback';
-import { TasterGroup } from '../../server/devices/groups/tasterGroup';
-import { PraesenzGroup } from '../../server/devices/groups/praesenzGroup';
-import { HeatGroup } from '../../server/devices/groups/heatGroup';
-import { WaterGroup } from '../../server/devices/groups/waterGroup';
-import { LampenGroup } from '../../server/devices/groups/lampenGroup';
-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 { BaseGroup, DeviceCluster, FensterGroup, GroupType, HeatGroup, LampenGroup, PraesenzGroup, SmokeGroup, SonosGroup, TasterGroup, WaterGroup } from '../../server';
+import { RoomSettings } from './RoomSettings';
 import { iRoomBase } from './iRoomBase';
 import { RoomInfo } from './roomInfo';
-import { BaseGroup } from '../../server/devices/groups/base-group';
-import { GroupType } from '../../server/devices/groups/group-type';
-import { DeviceCluster } from '../../server/devices/device-cluster';
 export declare class RoomBase implements iRoomBase {
     settings: RoomSettings;
     groups: Map<GroupType, BaseGroup>;
     info: RoomInfo;
+    sonnenAufgangCallback: TimeCallback | undefined;
+    sonnenUntergangCallback: TimeCallback | undefined;
+    sonnenAufgangLichtCallback: TimeCallback | undefined;
+    skipNextRolloUp: boolean;
+    constructor(roomName: string, settings: RoomSettings, groups: Map<GroupType, BaseGroup>);
     protected _deviceCluster: DeviceCluster;
     get deviceCluster(): DeviceCluster;
     get FensterGroup(): FensterGroup | undefined;
@@ -27,13 +22,8 @@ export declare class RoomBase implements iRoomBase {
     get SmokeGroup(): SmokeGroup | undefined;
     get WaterGroup(): WaterGroup | undefined;
     get HeatGroup(): HeatGroup | undefined;
-    sonnenAufgangCallback: TimeCallback | undefined;
-    sonnenUntergangCallback: TimeCallback | undefined;
-    sonnenAufgangLichtCallback: TimeCallback | undefined;
-    skipNextRolloUp: boolean;
     get roomName(): string;
     get etage(): number | undefined;
-    constructor(roomName: string, settings: RoomSettings, groups: Map<GroupType, BaseGroup>);
     initializeBase(): void;
     persist(): void;
     recalcTimeCallbacks(): void;

package/lib/models/rooms/RoomBase.js

@@ -4,54 +4,48 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RoomBase = void 0;
+const timeCallback_1 = require("../timeCallback");
+const server_1 = require("../../server");
 const logLevel_1 = require("../logLevel");
-const log_service_1 = require("../../server/services/log-service/log-service");
-const time_callback_service_1 = require("../../server/services/time-callback-service");
-const room_service_1 = require("../../server/services/room-service/room-service");
 const roomInfo_1 = require("./roomInfo");
-const group_type_1 = require("../../server/devices/groups/group-type");
-const ShutterService_1 = require("../../server/services/ShutterService");
-const utils_1 = require("../../server/services/utils/utils");
 const lodash_1 = __importDefault(require("lodash"));
-const device_cluster_1 = require("../../server/devices/device-cluster");
-const index_1 = require("../../index");
 class RoomBase {
     constructor(roomName, settings, groups) {
         this.settings = settings;
         this.groups = groups;
-        this._deviceCluster = new device_cluster_1.DeviceCluster();
         this.skipNextRolloUp = false;
+        this._deviceCluster = new server_1.DeviceCluster();
         this.info = new roomInfo_1.RoomInfo(roomName, settings);
         settings.roomName = roomName;
         this.settings = settings;
-        room_service_1.RoomService.addToRoomList(this);
+        server_1.RoomService.addToRoomList(this);
     }
     get deviceCluster() {
         return this._deviceCluster;
     }
     get FensterGroup() {
-        return this.groups.get(group_type_1.GroupType.Window);
+        return this.groups.get(server_1.GroupType.Window);
     }
     get PraesenzGroup() {
-        return this.groups.get(group_type_1.GroupType.Presence);
+        return this.groups.get(server_1.GroupType.Presence);
     }
     get LampenGroup() {
-        return this.groups.get(group_type_1.GroupType.Light);
+        return this.groups.get(server_1.GroupType.Light);
     }
     get TasterGroup() {
-        return this.groups.get(group_type_1.GroupType.Buttons);
+        return this.groups.get(server_1.GroupType.Buttons);
     }
     get SonosGroup() {
-        return this.groups.get(group_type_1.GroupType.Speaker);
+        return this.groups.get(server_1.GroupType.Speaker);
     }
     get SmokeGroup() {
-        return this.groups.get(group_type_1.GroupType.Smoke);
+        return this.groups.get(server_1.GroupType.Smoke);
     }
     get WaterGroup() {
-        return this.groups.get(group_type_1.GroupType.Water);
+        return this.groups.get(server_1.GroupType.Water);
     }
     get HeatGroup() {
-        return this.groups.get(group_type_1.GroupType.Heating);
+        return this.groups.get(server_1.GroupType.Heating);
     }
     get roomName() {
         return this.info.roomName;
@@ -68,7 +62,8 @@ class RoomBase {
         (_c = this.TasterGroup) === null || _c === void 0 ? void 0 : _c.initCallbacks();
     }
     persist() {
-        index_1.dbo === null || index_1.dbo === void 0 ? void 0 : index_1.dbo.addRoom(this);
+        var _a;
+        (_a = server_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.addRoom(this);
     }
     recalcTimeCallbacks() {
         const now = new Date();
@@ -107,14 +102,14 @@ class RoomBase {
             return;
         }
         let timeOfDay = this.settings.roomIsAlwaysDark
-            ? time_callback_service_1.TimeOfDay.Night
-            : time_callback_service_1.TimeCallbackService.dayType(this.settings.lampOffset);
-        if (timeOfDay === time_callback_service_1.TimeOfDay.Daylight &&
+            ? timeCallback_1.TimeOfDay.Night
+            : server_1.TimeCallbackService.dayType(this.settings.lampOffset);
+        if (timeOfDay === timeCallback_1.TimeOfDay.Daylight &&
             ((this.settings.lightIfNoWindows && (!this.FensterGroup || this.FensterGroup.fenster.length === 0)) ||
                 ((_b = this.FensterGroup) === null || _b === void 0 ? void 0 : _b.fenster.some((f) => {
-                    return ShutterService_1.ShutterService.anyRolloDown(f.getShutter());
+                    return server_1.ShutterService.anyRolloDown(f.getShutter());
                 })))) {
-            timeOfDay = time_callback_service_1.TimeOfDay.AfterSunset;
+            timeOfDay = timeCallback_1.TimeOfDay.AfterSunset;
         }
         this.LampenGroup.switchTimeConditional(timeOfDay);
     }
@@ -125,23 +120,23 @@ class RoomBase {
             return false;
         }
         let timeOfDay = this.settings.roomIsAlwaysDark
-            ? time_callback_service_1.TimeOfDay.Night
-            : time_callback_service_1.TimeCallbackService.dayType(this.settings.lampOffset);
-        if (timeOfDay === time_callback_service_1.TimeOfDay.Daylight &&
+            ? timeCallback_1.TimeOfDay.Night
+            : server_1.TimeCallbackService.dayType(this.settings.lampOffset);
+        if (timeOfDay === timeCallback_1.TimeOfDay.Daylight &&
             ((_a = this.FensterGroup) === null || _a === void 0 ? void 0 : _a.fenster.some((f) => {
-                return ShutterService_1.ShutterService.anyRolloDown(f.getShutter());
+                return server_1.ShutterService.anyRolloDown(f.getShutter());
             }))) {
-            timeOfDay = time_callback_service_1.TimeOfDay.AfterSunset;
+            timeOfDay = timeCallback_1.TimeOfDay.AfterSunset;
         }
-        return time_callback_service_1.TimeCallbackService.darkOutsideOrNight(timeOfDay);
+        return server_1.TimeCallbackService.darkOutsideOrNight(timeOfDay);
     }
     toJSON() {
-        const result = utils_1.Utils.jsonFilter(this);
+        const result = server_1.Utils.jsonFilter(this);
         result.groupDict = Object.fromEntries(this.groups);
         return lodash_1.default.omit(result, ['groups', '_deviceCluster']);
     }
     log(level, message) {
-        log_service_1.ServerLogService.writeLog(level, message, {
+        server_1.ServerLogService.writeLog(level, message, {
             room: this.roomName,
         });
     }

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

@@ -76,6 +76,7 @@ class RoomSettings {
     }
     set sonnenUntergangRolloDelay(value) {
         this._sonnenUntergangRolloDelay = value;
+        this.recalcRolloOffset();
     }
     get movementResetTimer() {
         return this._movementResetTimer;

package/lib/models/timeCallback.d.ts

@@ -1,9 +1,15 @@
-import { SunTimeOffsets } from '../server/services/time-callback-service';
+import { SunTimeOffsets } from '../server';
 export declare enum TimeCallbackType {
     TimeOfDay = 1,
     Sunrise = 2,
     SunSet = 3
 }
+export declare enum TimeOfDay {
+    BeforeSunrise = 1,
+    Daylight = 2,
+    AfterSunset = 3,
+    Night = 4
+}
 export declare class TimeCallback {
     name: string;
     type: TimeCallbackType;

package/lib/models/timeCallback.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TimeCallback = exports.TimeCallbackType = void 0;
-const log_service_1 = require("../server/services/log-service/log-service");
-const time_callback_service_1 = require("../server/services/time-callback-service");
+exports.TimeCallback = exports.TimeOfDay = exports.TimeCallbackType = void 0;
+const server_1 = require("../server");
 const logLevel_1 = require("./logLevel");
 var TimeCallbackType;
 (function (TimeCallbackType) {
@@ -10,6 +9,13 @@ var TimeCallbackType;
     TimeCallbackType[TimeCallbackType["Sunrise"] = 2] = "Sunrise";
     TimeCallbackType[TimeCallbackType["SunSet"] = 3] = "SunSet";
 })(TimeCallbackType = exports.TimeCallbackType || (exports.TimeCallbackType = {}));
+var TimeOfDay;
+(function (TimeOfDay) {
+    TimeOfDay[TimeOfDay["BeforeSunrise"] = 1] = "BeforeSunrise";
+    TimeOfDay[TimeOfDay["Daylight"] = 2] = "Daylight";
+    TimeOfDay[TimeOfDay["AfterSunset"] = 3] = "AfterSunset";
+    TimeOfDay[TimeOfDay["Night"] = 4] = "Night";
+})(TimeOfDay = exports.TimeOfDay || (exports.TimeOfDay = {}));
 class TimeCallback {
     constructor(name, type, cFunction, minuteOffset, hours, minutes, sunTimeOffset) {
         this.name = name;
@@ -37,12 +43,12 @@ class TimeCallback {
                     // Heute ist schon abgelaufen, also morgen festlegen
                     this.nextToDo = new Date(this.nextToDo.getTime() + 24 * 60 * 60 * 1000);
                 }
-                log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Trace, `Nächste Zeitevent für "${this.name}" um ${this.nextToDo.toLocaleTimeString('de-DE')}`);
+                server_1.ServerLogService.writeLog(logLevel_1.LogLevel.Trace, `Nächste Zeitevent für "${this.name}" um ${this.nextToDo.toLocaleTimeString('de-DE')}`);
                 break;
             case TimeCallbackType.Sunrise:
-                let fixedSRDate = new Date(time_callback_service_1.TimeCallbackService.nextSunRise.getTime() + this.minuteOffset * 60 * 1000);
+                let fixedSRDate = new Date(server_1.TimeCallbackService.nextSunRise.getTime() + this.minuteOffset * 60 * 1000);
                 if (this.sunTimeOffset) {
-                    const nextMinSR = this.sunTimeOffset.getNextMinimumSunrise();
+                    const nextMinSR = this.sunTimeOffset.getNextMinimumSunrise(now);
                     if (nextMinSR > fixedSRDate && fixedSRDate.getDate() === nextMinSR.getDate()) {
                         fixedSRDate = nextMinSR;
                     }
@@ -50,13 +56,13 @@ class TimeCallback {
                 if (now > fixedSRDate) {
                     return;
                 }
-                log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Trace, `Nächste Zeitevent für "${this.name}" um ${fixedSRDate.toLocaleTimeString('de-DE')}`);
+                server_1.ServerLogService.writeLog(logLevel_1.LogLevel.Trace, `Nächste Zeitevent für "${this.name}" um ${fixedSRDate.toLocaleTimeString('de-DE')}`);
                 this.nextToDo = fixedSRDate;
                 break;
             case TimeCallbackType.SunSet:
-                let fixedSSDate = new Date(time_callback_service_1.TimeCallbackService.nextSunSet.getTime() + this.minuteOffset * 60 * 1000);
+                let fixedSSDate = new Date(server_1.TimeCallbackService.nextSunSet.getTime() + this.minuteOffset * 60 * 1000);
                 if (this.sunTimeOffset) {
-                    const nextMaxSS = this.sunTimeOffset.getNextMaximumSunset();
+                    const nextMaxSS = this.sunTimeOffset.getNextMaximumSunset(now);
                     if (nextMaxSS < fixedSSDate && fixedSSDate.getDate() === nextMaxSS.getDate()) {
                         fixedSSDate = nextMaxSS;
                     }
@@ -64,7 +70,7 @@ class TimeCallback {
                 if (now > fixedSSDate) {
                     return;
                 }
-                log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Trace, `Nächste Zeitevent für "${this.name}" um ${fixedSSDate.toLocaleTimeString('de-DE')}`);
+                server_1.ServerLogService.writeLog(logLevel_1.LogLevel.Trace, `Nächste Zeitevent für "${this.name}" um ${fixedSSDate.toLocaleTimeString('de-DE')}`);
                 this.nextToDo = fixedSSDate;
                 break;
         }

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

@@ -1,4 +1,4 @@
-import { HmIpHeizgruppe } from './hmIPDevices/hmIpHeizgruppe';
+import { HmIpHeizgruppe } from './hmIPDevices';
 export declare class Heizgruppen {
     static getInfo(): string;
     static getSpecificInfo(pText: string | undefined): Promise<string>;

package/lib/server/devices/Heizgruppen.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Heizgruppen = void 0;
 const deviceType_1 = require("./deviceType");
 const devices_1 = require("./devices");
-const index_1 = require("../../index");
+const services_1 = require("../services");
 class Heizgruppen {
     static getInfo() {
         const gruppen = Heizgruppen.getAllGruppen();
@@ -18,7 +18,7 @@ class Heizgruppen {
         return response.join('\n');
     }
     static async getSpecificInfo(pText) {
-        var _a;
+        var _a, _b;
         if (pText === undefined || !pText.includes('"')) {
             return `Bitte übergeben Sie eine Heizgruppe innerhalb von "". z.B. "EG Flur HeizGr"`;
         }
@@ -27,7 +27,7 @@ class Heizgruppen {
         if (group === undefined) {
             return `"${searchText}" ist keine gültige Heizgruppe, im Folgenden ist eine Liste aller gültigen Heizgruppen:\n${this.getInfo()}`;
         }
-        const results = (_a = (await (index_1.dbo === null || index_1.dbo === void 0 ? void 0 : index_1.dbo.readTemperaturDataPoint(group, 20)))) !== null && _a !== void 0 ? _a : [];
+        const results = (_b = (await ((_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.readTemperaturDataPoint(group, 20)))) !== null && _b !== void 0 ? _b : [];
         const response = [`Dies sind die letzten 20 Messpunkte der Heizgruppe:`];
         response.push(`Zeitpunkt\t\tIst-Temperatur\t\tSoll-Temperatur\t\tVentilstellung`);
         for (const r of results) {

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

@@ -1,30 +1,27 @@
 /// <reference types="iobroker" />
+import { IBaseDevice } from './iBaseDevice';
 import { DeviceInfo } from './DeviceInfo';
-import { RoomDeviceAddingSettings } from '../../models/rooms/RoomSettings/roomDeviceAddingSettings';
-import { IOBrokerConnection } from '../ioBroker/connection';
-import { LogLevel } from '../../models/logLevel';
+import { LogLevel, RoomBase, RoomDeviceAddingSettings } from '../../models';
+import { IOBrokerConnection } from '../ioBroker';
 import { DeviceType } from './deviceType';
-import { RoomBase } from '../../models/rooms/RoomBase';
-export declare abstract class IoBrokerBaseDevice {
+export declare abstract class IoBrokerBaseDevice implements IBaseDevice {
     protected _info: DeviceInfo;
     deviceType: DeviceType;
     static roomAddingSettings: {
         [id: string]: RoomDeviceAddingSettings;
     };
-    static addRoom(shortName: string, settings: RoomDeviceAddingSettings): void;
-    static checkMissing(): void;
     room: RoomBase | undefined;
     battery: number | undefined;
-    get id(): string;
     protected constructor(_info: DeviceInfo, deviceType: DeviceType);
+    get id(): string;
     /**
      * Getter info
-     * @return {TradFriInfo}
+     * @return {DeviceInfo}
      */
     get info(): DeviceInfo;
     /**
      * Setter info
-     * @param {TradFriInfo} value
+     * @param {DeviceInfo} value
      */
     set info(value: DeviceInfo);
     /**
@@ -32,14 +29,17 @@ export declare abstract class IoBrokerBaseDevice {
      * @return {IOBrokerConnection}
      */
     get ioConn(): IOBrokerConnection | undefined;
+    static addRoom(shortName: string, settings: RoomDeviceAddingSettings): void;
+    static checkMissing(): void;
     /**
      * Returns whether a connection to ioBroker is established or not
      * @param showError If true, an error message will be written to the log if the connection is not established
      */
     checkIoConnection(showError?: boolean): boolean;
     abstract update(idSplit: string[], state: ioBroker.State, initial: boolean, pOverride: boolean): void;
+    log(level: LogLevel, message: string): void;
+    toJSON(): Partial<IoBrokerBaseDevice>;
     protected addToCorrectRoom(): void;
-    protected log(level: LogLevel, message: string): void;
     /**
      * Sets the state of a given data point and returns true if that was successful.
      * @param pointId Data point to write to
@@ -48,5 +48,4 @@ export declare abstract class IoBrokerBaseDevice {
      * @param onError Callback to run if an error has occurred during writing the data
      */
     protected setState(pointId: string, state: string | number | boolean | ioBroker.State | ioBroker.SettableState | null, onSuccess?: (() => void) | undefined, onError?: ((error: Error) => void) | undefined): void;
-    toJSON(): Partial<IoBrokerBaseDevice>;
 }