hoffmation-base 3.0.0-alpha.1 → 3.0.0-alpha.3

package/lib/models/command/baseCommand.js

@@ -26,6 +26,9 @@ class BaseCommand {
             reason = this.source.reasonTrace;
         }
         if (this.reason === '') {
+            if (reason === '') {
+                return `${this._commandType}`;
+            }
             return `${reason} -> ${this._commandType}`;
         }
         return `${reason} -> ${this._commandType}(${this.reason})`;

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} from ${this.source} for reason: ${this.reasonTrace}`;
+        return `Dimmer setLight to ${this.on} for reason: ${this.reasonTrace}`;
     }
     static byTimeBased(s, c) {
         switch (c.time) {

package/lib/server/devices/sharedFunctions/lampUtils.js

@@ -64,6 +64,7 @@ class LampUtils {
         return false;
     }
     static setActuator(device, c) {
+        const dontBlock = LampUtils.checkUnBlock(device, c);
         if (LampUtils.checkBlockActive(device, c)) {
             return;
         }
@@ -76,10 +77,7 @@ class LampUtils {
             c.timeout = 3000;
             LampUtils.stromStossOn(device);
         }
-        if (c.timeout < 0 || !c.on) {
-            return;
-        }
-        if (c.timeout > -1 && device.blockAutomationHandler !== undefined) {
+        if (c.timeout > -1 && !dontBlock) {
             device.blockAutomationHandler.disableAutomatic(c.timeout, models_1.CollisionSolving.overrideIfGreater);
         }
     }