hoffmation-base 3.2.1-alpha.3 → 3.2.1-alpha.5

package/lib/command/baseCommand.js

@@ -61,13 +61,13 @@ class BaseCommand {
     }
     get reasonTrace() {
         let ownPart = `${this.type}`;
-        if (this.reason !== undefined) {
+        if (this.reason) {
             ownPart += `("${this.reason}")`;
         }
         if (this.ignoreReason !== undefined) {
             ownPart += ` ignored due to: "${this.ignoreReason}"`;
         }
-        if (typeof this.source === 'object') {
+        if (this.source.timestamp) {
             return `${this.source.reasonTrace} -> ${ownPart}`;
         }
         return `CommandType("${enums_1.CommandSource[this.source]}") stack => ${ownPart}`;
@@ -76,7 +76,7 @@ class BaseCommand {
         if (this.type === type) {
             return true;
         }
-        if (this.source instanceof BaseCommand) {
+        if (this.source.timestamp) {
             return this.source.containsType(type);
         }
         return false;

package/lib/devices/BaseDevice.js

@@ -1,10 +1,14 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseDevice = void 0;
 const enums_1 = require("../enums");
 const utils_1 = require("../utils");
 const logging_1 = require("../logging");
 const services_1 = require("../services");
+const lodash_1 = __importDefault(require("lodash"));
 class BaseDevice {
     constructor(_info, deviceType) {
         this._info = _info;
@@ -86,6 +90,9 @@ class BaseDevice {
     }
     /** @inheritDoc */
     toJSON() {
+        // eslint-disable-next-line
+        const returnValue = lodash_1.default.omit(this, 'lastCommands');
+        returnValue['lastCommands'] = this.lastCommands.readAmount(this.lastCommands.maximumSize);
         return utils_1.Utils.jsonFilter(this, this.jsonOmitKeys);
     }
 }

package/lib/devices/dachs/dachsTemperatureSensor.js

@@ -20,7 +20,7 @@ class DachsTemperatureSensor extends RoomBaseDevice_1.RoomBaseDevice {
         /** @inheritDoc */
         this.temperatureSensor = new sharedFunctions_1.TemperatureSensor(this);
         this.deviceCapabilities.push(enums_1.DeviceCapability.temperatureSensor);
-        this.jsonOmitKeys.push(...['room', 'client', 'config', '_influxClient']);
+        this.jsonOmitKeys.push(...['client', 'config', '_influxClient']);
         devices_1.Devices.alLDevices[allDevicesKey] = this;
         devices_1.Devices.temperatureWarmWater = this;
     }

package/lib/devices/sharedFunctions/lampUtils.js

@@ -115,7 +115,6 @@ class LampUtils {
             device.targetAutomaticState = c.on;
         }
         if (LampUtils.canActuatorChangeBeSkipped(device, c)) {
-            device.logCommand(c, 'Actuator change can be skipped');
             return;
         }
         device.queuedValue = c.on;