hoffmation-base 3.0.0-alpha.31 → 3.0.0-alpha.33

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

@@ -1 +1,7 @@
 export { BaseAction } from './baseAction';
+export * from './humiditySensorChangeAction';
+export * from './motionSensorAction';
+export * from './presenceGroupLastLeftAction';
+export * from './presenceGroupFirstEnterAction';
+export * from './shutterPositionChangedAction';
+export * from './temperatureSensorChangeAction';

package/lib/models/action/index.js

@@ -1,5 +1,25 @@
 "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 });
 exports.BaseAction = void 0;
 var baseAction_1 = require("./baseAction");
 Object.defineProperty(exports, "BaseAction", { enumerable: true, get: function () { return baseAction_1.BaseAction; } });
+__exportStar(require("./humiditySensorChangeAction"), exports);
+__exportStar(require("./motionSensorAction"), exports);
+__exportStar(require("./presenceGroupLastLeftAction"), exports);
+__exportStar(require("./presenceGroupFirstEnterAction"), exports);
+__exportStar(require("./shutterPositionChangedAction"), exports);
+__exportStar(require("./temperatureSensorChangeAction"), exports);

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

@@ -16,7 +16,7 @@ class RoomSettingsController {
         this.lampOffset = new server_1.SunTimeOffsets(this.sonnenAufgangLampenDelay, this.sonnenUntergangLampenDelay);
         this._settingsContainer.onChangeCb = this.onSettingChange.bind(this);
         this._settingsContainer.initializeFromDb(room);
-        server_1.WeatherService.addWeatherUpdateCb(`RolloWeatherUpdate${this.roomName}`, () => {
+        server_1.WeatherService.addWeatherUpdateCb(`ShutterWeatherUpdate${this.roomName}`, () => {
             var _a;
             if (this.sonnenUntergangRolloAdditionalOffsetPerCloudiness > 0) {
                 (_a = this.room) === null || _a === void 0 ? void 0 : _a.recalcTimeCallbacks();

package/lib/models/timeCallback.js

@@ -96,15 +96,22 @@ class TimeCallback {
                 }
                 break;
         }
-        if (nextCalculatedTime < now && this.nextToDo && this.nextToDo > this.lastDone) {
-            server_1.ServerLogService.writeLog(logLevel_1.LogLevel.Info, `Time Callback recalc results in the past, while previous target wasn't yet done --> fire immediately.`);
-            this.perform(now);
-            return;
-        }
         if (((_a = this.nextToDo) === null || _a === void 0 ? void 0 : _a.getTime()) == nextCalculatedTime.getTime()) {
             // No change
             return;
         }
+        if (this.nextToDo && this.nextToDo > this.lastDone) {
+            if (nextCalculatedTime < now) {
+                server_1.ServerLogService.writeLog(logLevel_1.LogLevel.Info, `Time Callback recalc results in the past, while previous target wasn't yet done --> fire immediately.`);
+                this.perform(now);
+                return;
+            }
+            else if (nextCalculatedTime.getDay() !== this.nextToDo.getDay() && this.type === TimeCallbackType.SunSet) {
+                // Recalculation between Sunset and delayed sunset action can result in the next day beeing calculated --> fire immediately
+                server_1.ServerLogService.writeLog(logLevel_1.LogLevel.Info, `Time Callback recalc results in the next day, while previous action wasn't yet fired --> fire immediately.`);
+                this.perform(now);
+            }
+        }
         this.nextToDo = nextCalculatedTime;
         server_1.ServerLogService.writeLog(logLevel_1.LogLevel.Debug, `Next Time event for "${this.name}" at ${this.nextToDo.toLocaleString('de-DE')}`);
     }

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

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import { iRoomDevice } from './iRoomDevice';
-import { HumiditySensorChangeAction } from '../../../models/action/humiditySensorChangeAction';
+import { HumiditySensorChangeAction } from '../../../models';
 export declare const UNDEFINED_HUMIDITY_VALUE = -1;
 /**
  * This interface represents a humidity sensor device.

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

@@ -1,6 +1,5 @@
-import { MotionSensorSettings } from '../../../models';
+import { MotionSensorAction, MotionSensorSettings } from '../../../models';
 import { iRoomDevice } from './iRoomDevice';
-import { MotionSensorAction } from '../../../models/action/motionSensorAction';
 /**
  * This interface represents a motion sensor device.
  *

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

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import { iRoomDevice } from './iRoomDevice';
-import { TemperatureSensorChangeAction } from '../../../models/action/temperatureSensorChangeAction';
+import { TemperatureSensorChangeAction } from '../../../models';
 export declare const UNDEFINED_TEMP_VALUE = -99;
 /**
  * This interface represents a temperature sensor device.

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

@@ -1,10 +1,9 @@
 import { iBaseDevice, iCameraDevice, iRoomDevice } from '../baseDeviceInterfaces';
-import { CameraSettings, LogLevel, RoomBase } from '../../../models';
+import { CameraSettings, LogLevel, MotionSensorAction, RoomBase } from '../../../models';
 import { LogDebugType } from '../../services';
 import { DeviceInfo } from '../DeviceInfo';
 import { DeviceCapability } from '../DeviceCapability';
 import { DeviceType } from '../deviceType';
-import { MotionSensorAction } from '../../../models/action/motionSensorAction';
 export declare class CameraDevice implements iCameraDevice {
     /**
      * The name of the camera in BlueIris

package/lib/server/devices/blueIris/cameraDevice.js

@@ -13,7 +13,6 @@ const DeviceInfo_1 = require("../DeviceInfo");
 const DeviceCapability_1 = require("../DeviceCapability");
 const deviceType_1 = require("../deviceType");
 const ioBroker_1 = require("../../ioBroker");
-const motionSensorAction_1 = require("../../../models/action/motionSensorAction");
 class CameraDevice {
     constructor(mqttName, roomName, blueIrisName) {
         var _a;
@@ -238,7 +237,7 @@ class CameraDevice {
             this.log(models_1.LogLevel.Trace, `This is movement no. ${this.detectionsToday}`);
         }
         for (const c of this._movementDetectedCallback) {
-            c(new motionSensorAction_1.MotionSensorAction(this));
+            c(new models_1.MotionSensorAction(this));
         }
     }
     resetPersonDetectFallbackTimer() {

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

@@ -4,8 +4,7 @@ import { LogDebugType, OwnSonosDevice } from '../../services';
 import { DeviceCapability } from '../DeviceCapability';
 import { DeviceType } from '../deviceType';
 import { DeviceInfo } from '../DeviceInfo';
-import { DeviceSettings, LogLevel, RoomBase } from '../../../models';
-import { TemperatureSensorChangeAction } from '../../../models/action/temperatureSensorChangeAction';
+import { DeviceSettings, LogLevel, RoomBase, TemperatureSensorChangeAction } from '../../../models';
 export declare class DachsTemperatureSensor implements iTemperatureSensor {
     /** @inheritDoc */
     settings: DeviceSettings | undefined;

package/lib/server/devices/dachs/dachsTemperatureSensor.js

@@ -11,7 +11,7 @@ const deviceType_1 = require("../deviceType");
 const DeviceInfo_1 = require("../DeviceInfo");
 const devices_1 = require("../devices");
 const lodash_1 = __importDefault(require("lodash"));
-const temperatureSensorChangeAction_1 = require("../../../models/action/temperatureSensorChangeAction");
+const models_1 = require("../../../models");
 class DachsTemperatureSensor {
     constructor(roomName, shortKey, longKey) {
         /** @inheritDoc */
@@ -77,7 +77,7 @@ class DachsTemperatureSensor {
     set temperature(val) {
         this._temperature = val;
         for (const cb of this._temperaturCallbacks) {
-            cb(new temperatureSensorChangeAction_1.TemperatureSensorChangeAction(this, val));
+            cb(new models_1.TemperatureSensorChangeAction(this, val));
         }
     }
     update(newTemp) {
@@ -87,7 +87,7 @@ class DachsTemperatureSensor {
     addTempChangeCallback(pCallback) {
         this._temperaturCallbacks.push(pCallback);
         if (this._temperature > baseDeviceInterfaces_1.UNDEFINED_TEMP_VALUE) {
-            pCallback(new temperatureSensorChangeAction_1.TemperatureSensorChangeAction(this, this._temperature));
+            pCallback(new models_1.TemperatureSensorChangeAction(this, this._temperature));
         }
     }
     /** @inheritDoc */

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

@@ -1,10 +1,9 @@
 import { HmIpGriff } from '../hmIPDevices';
 import { WindowPosition } from '../models';
-import { WindowRestoreDesiredPositionCommand, WindowSetDesiredPositionCommand } from '../../../models';
+import { ShutterPositionChangedAction, WindowRestoreDesiredPositionCommand, WindowSetDesiredPositionCommand } from '../../../models';
 import { iShutter, iVibrationSensor } from '../baseDeviceInterfaces';
 import { BaseGroup } from './base-group';
 import { ZigbeeMagnetContact } from '../zigbee';
-import { ShutterPositionChangedAction } from '../../../models/action/shutterPositionChangedAction';
 export declare class Window extends BaseGroup {
     readonly handleIds: string[];
     readonly vibrationIds: string[];

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

@@ -1,7 +1,6 @@
+import { PresenceGroupFirstEnterAction, PresenceGroupLastLeftAction } from '../../../models';
 import { BaseGroup } from './base-group';
 import { iMotionSensor } from '../baseDeviceInterfaces';
-import { PresenceGroupFirstEnterAction } from '../../../models/action/presenceGroupFirstEnterAction';
-import { PresenceGroupLastLeftAction } from '../../../models/action/presenceGroupLastLeftAction';
 export declare class PresenceGroup extends BaseGroup {
     private _lastMovement;
     private _lastLeftTimeout;

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

@@ -7,8 +7,6 @@ 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 presenceGroupFirstEnterAction_1 = require("../../../models/action/presenceGroupFirstEnterAction");
-const presenceGroupLastLeftAction_1 = require("../../../models/action/presenceGroupLastLeftAction");
 class PresenceGroup extends base_group_1.BaseGroup {
     constructor(roomName, motionSensorIds) {
         super(roomName, group_type_1.GroupType.Presence);
@@ -86,7 +84,7 @@ class PresenceGroup extends base_group_1.BaseGroup {
         let timeAfterReset = services_1.Utils.nowMS() - this._lastMovement.getTime() - this.getRoom().settings.movementResetTimer * 1000;
         if (timeAfterReset > 0) {
             this.log(models_1.LogLevel.Debug, `Movement reset. Active Motions: ${this.presentAmount()}\tTime after Last Movement including Reset: ${timeAfterReset}`);
-            this.executeLastLeftCbs(new presenceGroupLastLeftAction_1.PresenceGroupLastLeftAction(action));
+            this.executeLastLeftCbs(new models_1.PresenceGroupLastLeftAction(action));
             return;
         }
         this.log(models_1.LogLevel.Debug, `Movement reset in ${this.roomName} delayed.`);
@@ -97,7 +95,7 @@ class PresenceGroup extends base_group_1.BaseGroup {
             const presentAmount = this.presentAmount();
             this.log(models_1.LogLevel.Debug, `Delayed Movement reset. Active Motions: ${this.presentAmount()}\tTime after Last Movement including Reset: ${timeAfterReset}, action: ${action.reasonTrace}`);
             if (presentAmount <= 0 && timeAfterReset > 0) {
-                this.executeLastLeftCbs(new presenceGroupLastLeftAction_1.PresenceGroupLastLeftAction(action));
+                this.executeLastLeftCbs(new models_1.PresenceGroupLastLeftAction(action));
             }
         }, Math.abs(timeAfterReset) + 500, this);
     }
@@ -118,7 +116,7 @@ class PresenceGroup extends base_group_1.BaseGroup {
             return;
         }
         for (const cb of this._firstEnterCbs) {
-            cb(new presenceGroupFirstEnterAction_1.PresenceGroupFirstEnterAction(action));
+            cb(new models_1.PresenceGroupFirstEnterAction(action));
         }
     }
     executeLastLeftCbs(action) {

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

@@ -1,8 +1,7 @@
 import { HmIPDevice } from './hmIpDevice';
-import { MotionSensorSettings } from '../../../models';
+import { MotionSensorAction, MotionSensorSettings } from '../../../models';
 import { iIlluminationSensor, iMotionSensor } from '../baseDeviceInterfaces';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
-import { MotionSensorAction } from '../../../models/action/motionSensorAction';
 export declare class HmIpBewegung extends HmIPDevice implements iIlluminationSensor, iMotionSensor {
     private static MOVEMENT_DETECTION;
     private static CURRENT_ILLUMINATION;

package/lib/server/devices/hmIPDevices/hmIpBewegung.js

@@ -6,7 +6,6 @@ const deviceType_1 = require("../deviceType");
 const models_1 = require("../../../models");
 const services_1 = require("../../services");
 const DeviceCapability_1 = require("../DeviceCapability");
-const motionSensorAction_1 = require("../../../models/action/motionSensorAction");
 class HmIpBewegung extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {
         var _a;
@@ -100,7 +99,7 @@ class HmIpBewegung extends hmIpDevice_1.HmIPDevice {
             this.log(models_1.LogLevel.Trace, `Dies ist die ${this.detectionsToday} Bewegung `);
         }
         for (const c of this._movementDetectedCallback) {
-            c(new motionSensorAction_1.MotionSensorAction(this));
+            c(new models_1.MotionSensorAction(this));
         }
     }
     resetFallbackTimeout() {

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

@@ -1,11 +1,9 @@
 /// <reference types="node" />
 import { HmIPDevice } from './hmIpDevice';
 import { iDisposable } from '../../services';
-import { HeaterSettings } from '../../../models';
+import { HeaterSettings, HumiditySensorChangeAction, TemperatureSensorChangeAction } from '../../../models';
 import { iHeater, iHumiditySensor, iTemperatureSensor } from '../baseDeviceInterfaces';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
-import { HumiditySensorChangeAction } from '../../../models/action/humiditySensorChangeAction';
-import { TemperatureSensorChangeAction } from '../../../models/action/temperatureSensorChangeAction';
 export declare class HmIpHeizgruppe extends HmIPDevice implements iTemperatureSensor, iHumiditySensor, iHeater, iDisposable {
     /** @inheritDoc */
     readonly persistHeaterInterval: NodeJS.Timeout;

package/lib/server/devices/hmIPDevices/hmIpHeizgruppe.js

@@ -8,8 +8,6 @@ const models_1 = require("../../../models");
 const baseDeviceInterfaces_1 = require("../baseDeviceInterfaces");
 const device_cluster_type_1 = require("../device-cluster-type");
 const DeviceCapability_1 = require("../DeviceCapability");
-const humiditySensorChangeAction_1 = require("../../../models/action/humiditySensorChangeAction");
-const temperatureSensorChangeAction_1 = require("../../../models/action/temperatureSensorChangeAction");
 class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.HmIpHeizgruppe);
@@ -69,7 +67,7 @@ class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
     set temperature(val) {
         this._temperature = val;
         for (const cb of this._temperatureCallbacks) {
-            cb(new temperatureSensorChangeAction_1.TemperatureSensorChangeAction(this, val));
+            cb(new models_1.TemperatureSensorChangeAction(this, val));
         }
     }
     /** @inheritDoc */
@@ -79,7 +77,7 @@ class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
     set humidity(val) {
         this._humidity = val;
         for (const cb of this._humidityCallbacks) {
-            cb(new humiditySensorChangeAction_1.HumiditySensorChangeAction(this, val));
+            cb(new models_1.HumiditySensorChangeAction(this, val));
         }
     }
     /** @inheritDoc */
@@ -117,7 +115,7 @@ class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
     addHumidityCallback(pCallback) {
         this._humidityCallbacks.push(pCallback);
         if (this._humidity > 0) {
-            pCallback(new humiditySensorChangeAction_1.HumiditySensorChangeAction(this, this._humidity));
+            pCallback(new models_1.HumiditySensorChangeAction(this, this._humidity));
         }
     }
     getBelongingHeizungen() {
@@ -157,7 +155,7 @@ class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
     addTempChangeCallback(pCallback) {
         this._temperatureCallbacks.push(pCallback);
         if (this._temperature > baseDeviceInterfaces_1.UNDEFINED_TEMP_VALUE) {
-            pCallback(new temperatureSensorChangeAction_1.TemperatureSensorChangeAction(this, this._temperature));
+            pCallback(new models_1.TemperatureSensorChangeAction(this, this._temperature));
         }
     }
     /** @inheritDoc */

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

@@ -1,8 +1,7 @@
 import { HmIPDevice } from './hmIpDevice';
-import { MotionSensorSettings } from '../../../models';
+import { MotionSensorAction, MotionSensorSettings } from '../../../models';
 import { iBatteryDevice, iIlluminationSensor, iMotionSensor } from '../baseDeviceInterfaces';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
-import { MotionSensorAction } from '../../../models/action/motionSensorAction';
 export declare class HmIpPraezenz extends HmIPDevice implements iIlluminationSensor, iBatteryDevice, iMotionSensor {
     private static PRESENCE_DETECTION;
     private static CURRENT_ILLUMINATION;

package/lib/server/devices/hmIPDevices/hmIpPraezenz.js

@@ -6,7 +6,6 @@ const deviceType_1 = require("../deviceType");
 const models_1 = require("../../../models");
 const services_1 = require("../../services");
 const DeviceCapability_1 = require("../DeviceCapability");
-const motionSensorAction_1 = require("../../../models/action/motionSensorAction");
 class HmIpPraezenz extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {
         var _a;
@@ -113,7 +112,7 @@ class HmIpPraezenz extends hmIpDevice_1.HmIPDevice {
             this.log(models_1.LogLevel.Trace, `Dies ist die ${this.detectionsToday} Bewegung `);
         }
         for (const c of this._movementDetectedCallback) {
-            c(new motionSensorAction_1.MotionSensorAction(this));
+            c(new models_1.MotionSensorAction(this));
         }
     }
     persistMotionSensor() {

package/lib/server/devices/hmIPDevices/hmIpRoll.js

@@ -11,7 +11,6 @@ const models_1 = require("../models");
 const models_2 = require("../../../models");
 const lodash_1 = __importDefault(require("lodash"));
 const DeviceCapability_1 = require("../DeviceCapability");
-const shutterPositionChangedAction_1 = require("../../../models/action/shutterPositionChangedAction");
 class HmIpRoll extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {
         var _a;
@@ -45,7 +44,7 @@ class HmIpRoll extends hmIpDevice_1.HmIPDevice {
         if (value !== this._currentLevel && this._window) {
             services_1.Utils.guardedNewThread(() => {
                 var _a;
-                (_a = this._window) === null || _a === void 0 ? void 0 : _a.rolloPositionChange(new shutterPositionChangedAction_1.ShutterPositionChangedAction(this, value));
+                (_a = this._window) === null || _a === void 0 ? void 0 : _a.rolloPositionChange(new models_2.ShutterPositionChangedAction(this, value));
             }, this);
             this.persist();
         }

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

@@ -10,19 +10,21 @@ export * from './scene/index';
 export * from './sharedFunctions/index';
 export * from './shelly/index';
 export * from './tuya/index';
+export * from './tv/index';
 export * from './zigbee/index';
 export * from './device-cluster';
 export * from './device-cluster-type';
 export * from './device-list';
+export { DeviceCapability } from './DeviceCapability';
 export * from './DeviceInfo';
 export * from './devices';
 export * from './deviceType';
 export * from './deviceUpdater';
 export * from './Griffe';
 export * from './Heizgruppen';
-export * from './mqtt';
 export * from './iDeviceUpdater';
+export * from './mqtt';
 export * from './IoBrokerBaseDevice';
-export * from './tv';
-export * from './wledDevice';
+export * from './IoBrokerDeviceInfo';
 export { NameAmountValuePair } from './nameAmountValuePair';
+export * from './wledDevice';

package/lib/server/devices/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.NameAmountValuePair = void 0;
+exports.NameAmountValuePair = exports.DeviceCapability = void 0;
 __exportStar(require("./baseDeviceInterfaces/index"), exports);
 __exportStar(require("./blueIris/index"), exports);
 __exportStar(require("./button/index"), exports);
@@ -27,20 +27,23 @@ __exportStar(require("./scene/index"), exports);
 __exportStar(require("./sharedFunctions/index"), exports);
 __exportStar(require("./shelly/index"), exports);
 __exportStar(require("./tuya/index"), exports);
+__exportStar(require("./tv/index"), exports);
 __exportStar(require("./zigbee/index"), exports);
 __exportStar(require("./device-cluster"), exports);
 __exportStar(require("./device-cluster-type"), exports);
 __exportStar(require("./device-list"), exports);
+var DeviceCapability_1 = require("./DeviceCapability");
+Object.defineProperty(exports, "DeviceCapability", { enumerable: true, get: function () { return DeviceCapability_1.DeviceCapability; } });
 __exportStar(require("./DeviceInfo"), exports);
 __exportStar(require("./devices"), exports);
 __exportStar(require("./deviceType"), exports);
 __exportStar(require("./deviceUpdater"), exports);
 __exportStar(require("./Griffe"), exports);
 __exportStar(require("./Heizgruppen"), exports);
-__exportStar(require("./mqtt"), exports);
 __exportStar(require("./iDeviceUpdater"), exports);
+__exportStar(require("./mqtt"), exports);
 __exportStar(require("./IoBrokerBaseDevice"), exports);
-__exportStar(require("./tv"), exports);
-__exportStar(require("./wledDevice"), exports);
+__exportStar(require("./IoBrokerDeviceInfo"), exports);
 var nameAmountValuePair_1 = require("./nameAmountValuePair");
 Object.defineProperty(exports, "NameAmountValuePair", { enumerable: true, get: function () { return nameAmountValuePair_1.NameAmountValuePair; } });
+__exportStar(require("./wledDevice"), exports);

package/lib/server/devices/zigbee/BaseDevices/zigbeeMotionSensor.d.ts

@@ -1,10 +1,9 @@
 /// <reference types="node" />
 import { DeviceType } from '../../deviceType';
 import { ZigbeeDevice } from './index';
-import { MotionSensorSettings } from '../../../../models';
+import { MotionSensorAction, MotionSensorSettings } from '../../../../models';
 import { iBatteryDevice, iMotionSensor } from '../../baseDeviceInterfaces';
 import { IoBrokerDeviceInfo } from '../../IoBrokerDeviceInfo';
-import { MotionSensorAction } from '../../../../models/action/motionSensorAction';
 export declare class ZigbeeMotionSensor extends ZigbeeDevice implements iMotionSensor, iBatteryDevice {
     /** @inheritDoc */
     settings: MotionSensorSettings;

package/lib/server/devices/zigbee/BaseDevices/zigbeeMotionSensor.js

@@ -5,7 +5,6 @@ const index_1 = require("./index");
 const models_1 = require("../../../../models");
 const services_1 = require("../../../services");
 const DeviceCapability_1 = require("../../DeviceCapability");
-const motionSensorAction_1 = require("../../../../models/action/motionSensorAction");
 class ZigbeeMotionSensor extends index_1.ZigbeeDevice {
     constructor(pInfo, type) {
         var _a;
@@ -103,7 +102,7 @@ class ZigbeeMotionSensor extends index_1.ZigbeeDevice {
             this.log(models_1.LogLevel.Trace, `This is movement no. ${this.detectionsToday}`);
         }
         for (const c of this._movementDetectedCallback) {
-            c(new motionSensorAction_1.MotionSensorAction(this));
+            c(new models_1.MotionSensorAction(this));
         }
     }
     /** @inheritDoc */

package/lib/server/devices/zigbee/BaseDevices/zigbeeShutter.js

@@ -10,7 +10,6 @@ const zigbeeDevice_1 = require("./zigbeeDevice");
 const models_2 = require("../../models");
 const lodash_1 = __importDefault(require("lodash"));
 const DeviceCapability_1 = require("../../DeviceCapability");
-const shutterPositionChangedAction_1 = require("../../../../models/action/shutterPositionChangedAction");
 class ZigbeeShutter extends zigbeeDevice_1.ZigbeeDevice {
     constructor(pInfo, pType) {
         var _a, _b;
@@ -53,7 +52,7 @@ class ZigbeeShutter extends zigbeeDevice_1.ZigbeeDevice {
         if (value !== this._currentLevel && this._window) {
             services_1.Utils.guardedNewThread(() => {
                 var _a;
-                (_a = this._window) === null || _a === void 0 ? void 0 : _a.rolloPositionChange(new shutterPositionChangedAction_1.ShutterPositionChangedAction(this, value));
+                (_a = this._window) === null || _a === void 0 ? void 0 : _a.rolloPositionChange(new models_1.ShutterPositionChangedAction(this, value));
             }, this);
             this.persist();
         }

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

@@ -2,8 +2,7 @@
 import { ZigbeeDevice } from './BaseDevices';
 import { iBatteryDevice, iHumiditySensor, iTemperatureSensor } from '../baseDeviceInterfaces';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
-import { HumiditySensorChangeAction } from '../../../models/action/humiditySensorChangeAction';
-import { TemperatureSensorChangeAction } from '../../../models/action/temperatureSensorChangeAction';
+import { HumiditySensorChangeAction, TemperatureSensorChangeAction } from '../../../models';
 export declare class ZigbeeSonoffTemp extends ZigbeeDevice implements iTemperatureSensor, iHumiditySensor, iBatteryDevice {
     private _battery;
     private _lastBatteryPersist;

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

@@ -7,8 +7,6 @@ const deviceType_1 = require("../deviceType");
 const DeviceCapability_1 = require("../DeviceCapability");
 const models_1 = require("../../../models");
 const services_1 = require("../../services");
-const humiditySensorChangeAction_1 = require("../../../models/action/humiditySensorChangeAction");
-const temperatureSensorChangeAction_1 = require("../../../models/action/temperatureSensorChangeAction");
 class ZigbeeSonoffTemp extends BaseDevices_1.ZigbeeDevice {
     /** @inheritDoc */
     get lastBatteryPersist() {
@@ -54,7 +52,7 @@ class ZigbeeSonoffTemp extends BaseDevices_1.ZigbeeDevice {
     set humidity(val) {
         this._humidity = val;
         for (const cb of this._humidityCallbacks) {
-            cb(new humiditySensorChangeAction_1.HumiditySensorChangeAction(this, val));
+            cb(new models_1.HumiditySensorChangeAction(this, val));
         }
     }
     /** @inheritDoc */
@@ -68,7 +66,7 @@ class ZigbeeSonoffTemp extends BaseDevices_1.ZigbeeDevice {
     set temperature(val) {
         this._temperature = val;
         for (const cb of this._temperaturCallbacks) {
-            cb(new temperatureSensorChangeAction_1.TemperatureSensorChangeAction(this, val));
+            cb(new models_1.TemperatureSensorChangeAction(this, val));
         }
     }
     /** @inheritDoc */
@@ -94,14 +92,14 @@ class ZigbeeSonoffTemp extends BaseDevices_1.ZigbeeDevice {
     addHumidityCallback(pCallback) {
         this._humidityCallbacks.push(pCallback);
         if (this._humidity > 0) {
-            pCallback(new humiditySensorChangeAction_1.HumiditySensorChangeAction(this, this._humidity));
+            pCallback(new models_1.HumiditySensorChangeAction(this, this._humidity));
         }
     }
     /** @inheritDoc */
     addTempChangeCallback(pCallback) {
         this._temperaturCallbacks.push(pCallback);
         if (this._temperature > baseDeviceInterfaces_1.UNDEFINED_TEMP_VALUE) {
-            pCallback(new temperatureSensorChangeAction_1.TemperatureSensorChangeAction(this, this._temperature));
+            pCallback(new models_1.TemperatureSensorChangeAction(this, this._temperature));
         }
     }
     /** @inheritDoc */