hoffmation-base 3.0.0-alpha.16 → 3.0.0-alpha.17

package/lib/models/command/actuatorSetStateCommand.js

@@ -11,7 +11,7 @@ class ActuatorSetStateCommand extends baseCommand_1.BaseCommand {
         this._commandType = commandType_1.CommandType.ActuatorSetStateCommand;
     }
     get logMessage() {
-        return `Actuator setState to ${this.on} for reason: ${this.reasonTrace}`;
+        return `Actuator setState to ${this.on} with timeout ${this.timeout} for reason: ${this.reasonTrace}`;
     }
     static byActuatorAndToggleCommand(device, c) {
         const newVal = device.queuedValue !== null ? !device.queuedValue : !device.actuatorOn;

package/lib/models/command/dimmerSetLightCommand.js

@@ -20,7 +20,7 @@ class DimmerSetLightCommand extends lampSetLightCommand_1.LampSetLightCommand {
         this._commandType = commandType_1.CommandType.DimmerSetLightCommand;
     }
     get logMessage() {
-        return `Dimmer setLight to ${this.on} for reason: ${this.reasonTrace}`;
+        return `Dimmer setLight to ${this.on} with Brightness ${this.brightness} with timeout ${this.timeout} for reason: ${this.reasonTrace}`;
     }
     static byTimeBased(s, c) {
         const manual = c.isForceAction;

package/lib/models/command/lampSetLightCommand.js

@@ -9,7 +9,7 @@ class LampSetLightCommand extends actuatorSetStateCommand_1.ActuatorSetStateComm
         this._commandType = commandType_1.CommandType.LampSetLightCommand;
     }
     get logMessage() {
-        return `Lamp setLight to ${this.on} for reason: ${this.reasonTrace}`;
+        return `Lamp setLight to ${this.on} with timeout ${this.timeout} for reason: ${this.reasonTrace}`;
     }
 }
 exports.LampSetLightCommand = LampSetLightCommand;

package/lib/models/command/wledSetLightCommand.d.ts

@@ -8,5 +8,6 @@ export declare class WledSetLightCommand extends DimmerSetLightCommand {
     preset?: number | undefined;
     _commandType: CommandType;
     constructor(source: CommandSource | BaseCommand, on: boolean, reason?: string, timeout?: number, brightness?: number, transitionTime?: number, preset?: number | undefined);
+    get logMessage(): string;
     static byTimeBased(settings: WledSettings, c: LampSetTimeBasedCommand): WledSetLightCommand;
 }

package/lib/models/command/wledSetLightCommand.js

@@ -10,6 +10,9 @@ class WledSetLightCommand extends dimmerSetLightCommand_1.DimmerSetLightCommand
         this.preset = preset;
         this._commandType = commandType_1.CommandType.WledSetLightCommand;
     }
+    get logMessage() {
+        return `Dimmer setLight to ${this.on} with Brightness ${this.brightness}, timeout ${this.timeout} and preset ${this.preset} for reason: ${this.reasonTrace}`;
+    }
     static byTimeBased(settings, c) {
         switch (c.time) {
             case timeCallback_1.TimeOfDay.Daylight:

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

@@ -14,6 +14,8 @@ export declare abstract class IoBrokerBaseDevice implements iRoomDevice {
     };
     private _room;
     readonly deviceCapabilities: DeviceCapability[];
+    protected _debounceStateDelay: number;
+    protected _lastWrite: number;
     get customName(): string;
     get room(): RoomBase;
     protected readonly individualStateCallbacks: Map<string, Array<(val: ioBroker.StateValue) => void>>;

package/lib/server/devices/IoBrokerBaseDevice.js

@@ -20,6 +20,9 @@ class IoBrokerBaseDevice {
         this.settings = undefined;
         this._room = undefined;
         this.deviceCapabilities = [];
+        // If configured > 0, this indicates the minimum time between state writes in ms
+        this._debounceStateDelay = 0;
+        this._lastWrite = 0;
         this.individualStateCallbacks = new Map();
         this.addToCorrectRoom();
         this.persistDeviceInfo();
@@ -152,13 +155,21 @@ class IoBrokerBaseDevice {
         if (!this.checkIoConnection(true)) {
             return;
         }
+        if (this._debounceStateDelay > 0 && services_1.Utils.nowMS() - this._lastWrite < this._debounceStateDelay) {
+            services_1.Utils.guardedTimeout(() => {
+                this.log(models_1.LogLevel.Trace, `Debounced write for ${pointId} to ${state}`);
+                this.setState(pointId, state, onSuccess, onError);
+            }, this._debounceStateDelay, this);
+            return;
+        }
+        this._lastWrite = services_1.Utils.nowMS();
         (_a = this.ioConn) === null || _a === void 0 ? void 0 : _a.setState(pointId, state, (err) => {
             if (err) {
                 if (onError) {
                     onError(err);
                 }
                 else {
-                    console.log(`Error occured while setting state "${pointId}" to "${state}": ${err}`);
+                    this.log(models_1.LogLevel.Error, `Error occured while setting state "${pointId}" to "${state}": ${err}`);
                 }
                 return;
             }

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

@@ -11,6 +11,7 @@ export declare class WledDevice extends IoBrokerBaseDevice implements iDimmableL
     settings: WledSettings;
     readonly blockAutomationHandler: BlockAutomaticHandler;
     targetAutomaticState: boolean;
+    protected readonly _debounceStateDelay: number;
     private readonly _onID;
     private readonly _presetID;
     private readonly _brightnessID;

package/lib/server/devices/wledDevice.js

@@ -17,6 +17,7 @@ class WledDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
         this.queuedValue = null;
         this.settings = new models_1.WledSettings();
         this.targetAutomaticState = false;
+        this._debounceStateDelay = 500;
         this._onID = `${this.info.fullID}.on`;
         this._presetID = `${this.info.fullID}.ps`;
         this._brightnessID = `${this.info.fullID}.bri`;
@@ -49,7 +50,6 @@ class WledDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
         this.setWled(new models_1.WledSetLightCommand(c, c.on, 'Set Wled due to DimmerSetLightCommand', c.timeout, c.brightness, c.transitionTime, undefined));
     }
     setWled(c) {
-        this.log(models_1.LogLevel.Debug, c.logMessage);
         if (this._onID === '') {
             services_1.ServerLogService.writeLog(models_1.LogLevel.Error, `Keine On ID für "${this.info.customName}" bekannt.`);
             return;
@@ -62,13 +62,13 @@ class WledDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
         if (sharedFunctions_1.LampUtils.checkBlockActive(this, c)) {
             return;
         }
+        this.log(models_1.LogLevel.Debug, c.logMessage);
         if (c.on && c.brightness !== -1 && this.brightness < 10) {
             c.brightness = 10;
         }
-        services_1.ServerLogService.writeLog(models_1.LogLevel.Debug, `WLED Schalten: "${this.info.customName}" An: ${c.on}\tHelligkeit: ${c.brightness}%`);
         this.queuedValue = c.on;
-        this.writeActuatorStateToDevice(new models_1.ActuatorWriteStateToDeviceCommand(c, c.on, 'WLED Schalten'));
         if (c.preset !== undefined) {
+            // Warning: This also turns the device on
             this.setState(this._presetID, c.preset, undefined, (err) => {
                 services_1.ServerLogService.writeLog(models_1.LogLevel.Error, `WLED schalten ergab Fehler: ${err}`);
             });
@@ -78,12 +78,12 @@ class WledDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
                 services_1.ServerLogService.writeLog(models_1.LogLevel.Error, `Dimmer Helligkeit schalten ergab Fehler: ${err}`);
             });
         }
+        this.writeActuatorStateToDevice(new models_1.ActuatorWriteStateToDeviceCommand(c, c.on, 'WLED Schalten'));
         if (c.timeout !== undefined && c.timeout > -1 && !dontBlock) {
             this.blockAutomationHandler.disableAutomatic(c.timeout, models_1.CollisionSolving.overrideIfGreater);
         }
     }
     setTimeBased(c) {
-        this.log(models_1.LogLevel.Debug, `Wled setTimeBased ${c.time}`);
         this.setWled(models_1.WledSetLightCommand.byTimeBased(this.settings, c));
     }
     persist() {

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

@@ -6,8 +6,6 @@ import { iDisposable } from '../../../services';
 export declare class ZigbeeDevice extends IoBrokerBaseDevice implements iDisposable {
     protected _available: boolean;
     protected _dontSendOnUnavailable: boolean;
-    protected _debounceStateDelay: number;
-    private _lastWrite;
     private readonly _deviceQueryId;
     get available(): boolean;
     protected _linkQuality: number;

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

@@ -18,9 +18,6 @@ class ZigbeeDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
         super(pInfo, pType);
         this._available = false;
         this._dontSendOnUnavailable = false;
-        // If configured > 0, this indicates the minimum time between state writes in ms
-        this._debounceStateDelay = 0;
-        this._lastWrite = 0;
         this._linkQuality = 0;
         this.persistZigbeeInterval = services_1.Utils.guardedInterval(() => {
             this.persistZigbeeDevice();
@@ -78,15 +75,7 @@ class ZigbeeDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
             this.log(models_1.LogLevel.Warn, `Device unavailable --> Not changing ${pointId} to ${state}`);
             return;
         }
-        if (this._debounceStateDelay === 0 || services_1.Utils.nowMS() - this._lastWrite > this._debounceStateDelay) {
-            this._lastWrite = services_1.Utils.nowMS();
-            super.setState(pointId, state, onSuccess, onError);
-            return;
-        }
-        services_1.Utils.guardedTimeout(() => {
-            this.log(models_1.LogLevel.Trace, `Debounced write to ${pointId} to ${state}`);
-            this.setState(pointId, state, onSuccess, onError);
-        }, this._debounceStateDelay, this);
+        super.setState(pointId, state, onSuccess, onError);
     }
 }
 exports.ZigbeeDevice = ZigbeeDevice;