hoffmation-base 2.22.1 → 2.22.3

package/lib/server/config/iIobrokerSettigns.d.ts

@@ -4,4 +4,8 @@ export interface iIobrokerSettigns {
      * This allows to detect states which crash the Websocket Payload limit
      */
     useSplitInitialization?: boolean;
+    /**
+     * Whether the new/advanced zigbee2mqtt adapter is used
+     */
+    useZigbee2mqtt?: boolean;
 }

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

@@ -6,6 +6,8 @@ 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,6 +18,9 @@ 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();
@@ -73,7 +76,15 @@ class ZigbeeDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
             this.log(models_1.LogLevel.Warn, `Device unavailable --> Not changing ${pointId} to ${state}`);
             return;
         }
-        super.setState(pointId, state, onSuccess, onError);
+        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);
     }
 }
 exports.ZigbeeDevice = ZigbeeDevice;

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

@@ -90,6 +90,7 @@ class ZigbeeDimmer extends index_1.ZigbeeDevice {
      * @param {number} transitionTime The transition time for the brightness, to switch smoothly
      */
     setLight(pValue, timeout = -1, force = false, brightness = -1, transitionTime = -1) {
+        var _a;
         if (this._stateIdState === '') {
             this.log(models_1.LogLevel.Error, `Keine State ID bekannt.`);
             return;
@@ -113,25 +114,25 @@ class ZigbeeDimmer extends index_1.ZigbeeDevice {
             brightness = 10;
         }
         this.log(models_1.LogLevel.Debug, `Set Light Acutator to "${pValue}" with brightness ${brightness}`, services_1.LogDebugType.SetActuator);
-        this.setState(this._stateIdState, pValue);
-        this.queuedValue = pValue;
-        if (brightness > -1) {
-            if (brightness < this.settings.turnOnThreshhold) {
-                this.setState(this._stateIdBrightness, this.settings.turnOnThreshhold, () => {
-                    services_1.Utils.guardedTimeout(() => {
-                        this.log(models_1.LogLevel.Info, `Delayed reduced brightness on ${this.info.customName}`);
-                        this.setState(this._stateIdBrightness, brightness);
-                    }, 1000, this);
-                });
-            }
-            else if (this._brightness !== brightness) {
-                // Only set brightness if it is different from the current one
-                this.setState(this._stateIdBrightness, brightness);
-            }
-        }
         if (timeout > -1 && !dontBlock) {
             this.blockAutomationHandler.disableAutomatic(timeout, models_1.CollisionSolving.overrideIfGreater);
         }
+        if (((_a = services_1.SettingsService.settings.ioBroker) === null || _a === void 0 ? void 0 : _a.useZigbee2mqtt) && !pValue) {
+            // With zigbee2mqtt to turn on only setting brighness>0 is needed, so we need state only for turning off
+            this.setState(this._stateIdState, pValue);
+            this.queuedValue = pValue;
+            return;
+        }
+        if (brightness >= this.settings.turnOnThreshhold) {
+            this.setState(this._stateIdBrightness, brightness);
+            return;
+        }
+        this.setState(this._stateIdBrightness, this.settings.turnOnThreshhold, () => {
+            services_1.Utils.guardedTimeout(() => {
+                this.log(models_1.LogLevel.Info, `Delayed reduced brightness on ${this.info.customName}`);
+                this.setState(this._stateIdBrightness, brightness);
+            }, 1000, this);
+        });
     }
     persist() {
         var _a;

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

@@ -11,5 +11,6 @@ export declare class ZigbeeInnr142C extends ZigbeeLedRGBCCT {
     protected readonly _stateNameTransitionTime: string;
     protected readonly _stateNameColor: string;
     protected readonly _stateNameColorTemp: string;
+    protected readonly _debounceStateDelay: number;
     constructor(pInfo: IoBrokerDeviceInfo);
 }

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

@@ -11,6 +11,7 @@ class ZigbeeInnr142C extends BaseDevices_1.ZigbeeLedRGBCCT {
         this._stateNameTransitionTime = 'transition_time';
         this._stateNameColor = 'color';
         this._stateNameColorTemp = 'colortemp';
+        this._debounceStateDelay = 2500;
         this._stateIdBrightness = `${this.info.fullID}.brightness`;
         this._stateIdColor = `${this.info.fullID}.color`;
         this._stateIdColorTemp = `${this.info.fullID}.colortemp`;