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

package/lib/models/command/ShutterSetLevelCommand.js

@@ -11,7 +11,7 @@ class ShutterSetLevelCommand extends baseCommand_1.BaseCommand {
         this._commandType = commandType_1.CommandType.ShutterSetLevelCommand;
     }
     get logMessage() {
-        return `Shutter setLevel to ${this.level} from ${this.source} for reason: ${this.reasonTrace}`;
+        return `Shutter setLevel to ${this.level} for reason: ${this.reasonTrace}`;
     }
 }
 exports.ShutterSetLevelCommand = ShutterSetLevelCommand;

package/lib/models/command/actuatorSetStateCommand.js

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

package/lib/models/command/actuatorToggleCommand.js

@@ -9,7 +9,7 @@ class ActuatorToggleCommand extends baseCommand_1.BaseCommand {
         this._commandType = commandType_1.CommandType.ActuatorToggleCommand;
     }
     get logMessage() {
-        return `Actuator toggle due to ${this.source} for reason: ${this.reasonTrace}`;
+        return `Actuator toggle for reason: ${this.reasonTrace}`;
     }
 }
 exports.ActuatorToggleCommand = ActuatorToggleCommand;

package/lib/models/command/actuatorWriteStateToDeviceCommand.js

@@ -10,7 +10,7 @@ class ActuatorWriteStateToDeviceCommand extends baseCommand_1.BaseCommand {
         this._commandType = commandType_1.CommandType.ActuatorWriteStateToDeviceCommand;
     }
     get logMessage() {
-        return `Actuator writeStateToDevice(${this.stateValue}) due to ${this.source} for reason: ${this.reasonTrace}`;
+        return `Actuator writeStateToDevice(${this.stateValue}) for reason: ${this.reasonTrace}`;
     }
 }
 exports.ActuatorWriteStateToDeviceCommand = ActuatorWriteStateToDeviceCommand;

package/lib/models/command/baseCommand.js

@@ -21,17 +21,11 @@ class BaseCommand {
         return this.source === commandSource_1.CommandSource.Initial;
     }
     get reasonTrace() {
-        let reason = '';
-        if (this.source instanceof BaseCommand) {
-            reason = this.source.reasonTrace;
-        }
-        if (this.reason === '') {
-            if (reason === '') {
-                return `${this._commandType}`;
-            }
-            return `${reason} -> ${this._commandType}`;
+        const ownPart = this.reason !== '' ? `${this._commandType}("${this.reason}")` : `${this._commandType}`;
+        if (typeof this.source === 'object') {
+            return `${this.source.reasonTrace} -> ${ownPart}`;
         }
-        return `${reason} -> ${this._commandType}(${this.reason})`;
+        return `CommandType("${commandSource_1.CommandSource[this.source]}") stack => ${ownPart}`;
     }
 }
 exports.BaseCommand = BaseCommand;

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} from ${this.source} for reason: ${this.reasonTrace}`;
+        return `Lamp setLight to ${this.on} for reason: ${this.reasonTrace}`;
     }
 }
 exports.LampSetLightCommand = LampSetLightCommand;

package/lib/models/command/lampSetTimeBasedCommand.js

@@ -19,7 +19,7 @@ class LampSetTimeBasedCommand extends baseCommand_1.BaseCommand {
         this._commandType = commandType_1.CommandType.LampSetTimeBasedCommand;
     }
     get logMessage() {
-        return `Lamp setTimeBased to ${timeCallback_1.TimeOfDay[this.time]} from ${this.source}`;
+        return `Lamp setTimeBased to ${timeCallback_1.TimeOfDay[this.time]} for reason: ${this.reasonTrace}`;
     }
 }
 exports.LampSetTimeBasedCommand = LampSetTimeBasedCommand;

package/lib/models/command/lampToggleLightCommand.js

@@ -18,7 +18,7 @@ class LampToggleLightCommand extends actuatorToggleCommand_1.ActuatorToggleComma
         this._commandType = commandType_1.CommandType.LampToggleLightCommand;
     }
     get logMessage() {
-        return `Lamp toggleLight from ${this.source} for reason: ${this.reasonTrace}`;
+        return `Lamp toggleLight for reason: ${this.reasonTrace}`;
     }
 }
 exports.LampToggleLightCommand = LampToggleLightCommand;

package/lib/models/command/ledSetLightCommand.js

@@ -23,7 +23,7 @@ class LedSetLightCommand extends dimmerSetLightCommand_1.DimmerSetLightCommand {
         this._commandType = commandType_1.CommandType.LedSetLightCommand;
     }
     get logMessage() {
-        return `Led setLight to ${this.on} from ${this.source} for reason: ${this.reasonTrace}`;
+        return `Led setLight to ${this.on} for reason: ${this.reasonTrace}`;
     }
     static byTimeBased(settings, c) {
         switch (c.time) {

package/lib/models/command/restoreTargetAutomaticValueCommand.js

@@ -9,7 +9,7 @@ class RestoreTargetAutomaticValueCommand extends baseCommand_1.BaseCommand {
         this._commandType = commandType_1.CommandType.ActuatorRestoreTargetAutomaticValueCommand;
     }
     get logMessage() {
-        return `Actuator restore target automatic value from ${this.source} for reason: ${this.reasonTrace}`;
+        return `Actuator restore target automatic value due to reason: ${this.reasonTrace}`;
     }
 }
 exports.RestoreTargetAutomaticValueCommand = RestoreTargetAutomaticValueCommand;

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

@@ -77,7 +77,6 @@ class HmIpRoll extends hmIpDevice_1.HmIPDevice {
         }
     }
     setLevel(command) {
-        this.log(models_2.LogLevel.Debug, command.logMessage);
         let targetLevel = command.level;
         if (!this._firstCommandRecieved && !command.isInitial) {
             this._firstCommandRecieved = true;
@@ -87,7 +86,7 @@ class HmIpRoll extends hmIpDevice_1.HmIPDevice {
             return;
         }
         if (this.currentLevel === targetLevel && !command.isForceAction) {
-            this.log(models_2.LogLevel.Debug, `Skip Rollo command to Position ${targetLevel} as this is the current one`, services_1.LogDebugType.SkipUnchangedRolloPosition);
+            this.log(models_2.LogLevel.Debug, `Skip Rollo command to Position ${targetLevel} as this is the current one, commandLog: ${command.logMessage}`, services_1.LogDebugType.SkipUnchangedRolloPosition);
             return;
         }
         if (this._setLevelSwitchID === '') {
@@ -97,6 +96,7 @@ class HmIpRoll extends hmIpDevice_1.HmIPDevice {
         if (!this.checkIoConnection(true)) {
             return;
         }
+        this.log(models_2.LogLevel.Debug, command.logMessage);
         if (this._window !== undefined) {
             if (this._window.griffeInPosition(models_1.WindowPosition.offen) > 0 && command.level < 100) {
                 if (!command.skipOpenWarning) {

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

@@ -75,19 +75,19 @@ class ZigbeeShutter extends zigbeeDevice_1.ZigbeeDevice {
         super.update(idSplit, state, initial, pOverride);
     }
     setLevel(c) {
-        this.log(models_1.LogLevel.Debug, c.logMessage);
         let pPosition = c.level;
         if (!this._firstCommandRecieved && !c.isInitial) {
             this._firstCommandRecieved = true;
         }
         else if (this._firstCommandRecieved && c.isInitial) {
-            this.log(models_1.LogLevel.Debug, `Skipped initial Rollo  to ${pPosition} as we recieved a command already`);
+            this.log(models_1.LogLevel.Debug, `Skipped initial Rollo to ${pPosition} as we recieved a command already`);
             return;
         }
         if (this.currentLevel === pPosition && !c.isForceAction) {
-            this.log(models_1.LogLevel.Debug, `Skip Rollo command to Position ${pPosition} as this is the current one`, services_1.LogDebugType.SkipUnchangedRolloPosition);
+            this.log(models_1.LogLevel.Debug, `Skip Rollo command to Position ${pPosition} as this is the current one, commandLog: ${c.logMessage}`, services_1.LogDebugType.SkipUnchangedRolloPosition);
             return;
         }
+        this.log(models_1.LogLevel.Debug, c.logMessage);
         if (this._window !== undefined) {
             if (this._window.griffeInPosition(models_2.WindowPosition.offen) > 0 && pPosition < 100) {
                 if (!c.skipOpenWarning) {