hoffmation-base 3.2.1-alpha.4 → 3.2.1-alpha.6

package/lib/action/actuatorChangeAction.js

@@ -5,7 +5,7 @@ const baseAction_1 = require("./baseAction");
 const enums_1 = require("../enums");
 class ActuatorChangeAction extends baseAction_1.BaseAction {
     constructor(device) {
-        super(undefined, `New Actuator state (${device.actuatorOn}) received`);
+        super(enums_1.CommandSource.Automatic, `New Actuator state (${device.actuatorOn}) received`);
         /** @inheritDoc */
         this.type = enums_1.CommandType.ActuatorChangeAction;
         this.actuatorOn = device.actuatorOn;

package/lib/action/baseAction.d.ts

@@ -1,5 +1,6 @@
 import { BaseCommand } from '../command';
+import { CommandSource } from '../enums';
 export declare abstract class BaseAction extends BaseCommand {
-    protected constructor(source?: BaseAction, reason?: string);
+    protected constructor(source: BaseAction | CommandSource, reason?: string);
     get logMessage(): string;
 }

package/lib/action/baseAction.js

@@ -2,10 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseAction = void 0;
 const command_1 = require("../command");
-const enums_1 = require("../enums");
 class BaseAction extends command_1.BaseCommand {
     constructor(source, reason) {
-        super(source !== null && source !== void 0 ? source : enums_1.CommandSource.Automatic, reason);
+        super(source, reason);
     }
     get logMessage() {
         return this.reasonTrace;

package/lib/action/batteryLevelChangeAction.js

@@ -5,7 +5,7 @@ const baseAction_1 = require("./baseAction");
 const enums_1 = require("../enums");
 class BatteryLevelChangeAction extends baseAction_1.BaseAction {
     constructor(device) {
-        super(undefined, `New Battery Level (${device.batteryLevel}%) received`);
+        super(enums_1.CommandSource.Automatic, `New Battery Level (${device.batteryLevel}%) received`);
         /** @inheritDoc */
         this.type = enums_1.CommandType.BatteryManagerLevelChangeAction;
         this.newLevel = device.batteryLevel;

package/lib/action/handleChangeAction.js

@@ -5,7 +5,7 @@ const baseAction_1 = require("./baseAction");
 const enums_1 = require("../enums");
 class HandleChangeAction extends baseAction_1.BaseAction {
     constructor(handle) {
-        super(undefined, `${handle.customName} ${handle.position === enums_1.WindowPosition.closed ? 'opened' : 'closed'}`);
+        super(enums_1.CommandSource.Automatic, `${handle.customName} ${handle.position === enums_1.WindowPosition.closed ? 'opened' : 'closed'}`);
         /** @inheritDoc */
         this.type = enums_1.CommandType.HandleChangedAction;
         this.handle = handle;

package/lib/action/humiditySensorChangeAction.js

@@ -5,7 +5,7 @@ const baseAction_1 = require("./baseAction");
 const enums_1 = require("../enums");
 class HumiditySensorChangeAction extends baseAction_1.BaseAction {
     constructor(sensor, newHumidity) {
-        super(undefined, `${sensor.customName} detected ${newHumidity} humidity`);
+        super(enums_1.CommandSource.Automatic, `${sensor.customName} detected ${newHumidity} humidity`);
         /** @inheritDoc */
         this.type = enums_1.CommandType.HumiditySensorChangeAction;
         this.newHumidity = newHumidity;

package/lib/action/motionSensorAction.js

@@ -5,7 +5,7 @@ const baseAction_1 = require("./baseAction");
 const enums_1 = require("../enums");
 class MotionSensorAction extends baseAction_1.BaseAction {
     constructor(sensor) {
-        super(undefined, `${sensor.customName} ${sensor.movementDetected ? 'detected' : 'cleared'} motion`);
+        super(enums_1.CommandSource.Automatic, `${sensor.customName} ${sensor.movementDetected ? 'detected' : 'cleared'} motion`);
         /** @inheritDoc */
         this.type = enums_1.CommandType.MotionSensorAction;
         this.motionDetected = sensor.movementDetected;

package/lib/action/presenceGroupAnyMovementAction.d.ts

@@ -1,7 +1,7 @@
 import { BaseAction } from './baseAction';
-import { CommandType } from '../enums';
+import { CommandSource, CommandType } from '../enums';
 export declare class PresenceGroupAnyMovementAction extends BaseAction {
     /** @inheritDoc */
     type: CommandType;
-    constructor(source?: BaseAction, reason?: string);
+    constructor(source: BaseAction | CommandSource, reason?: string);
 }

package/lib/action/presenceGroupFirstEnterAction.d.ts

@@ -1,7 +1,7 @@
 import { BaseAction } from './baseAction';
-import { CommandType } from '../enums';
+import { CommandSource, CommandType } from '../enums';
 export declare class PresenceGroupFirstEnterAction extends BaseAction {
     /** @inheritDoc */
     type: CommandType;
-    constructor(source?: BaseAction, reason?: string);
+    constructor(source: BaseAction | CommandSource, reason?: string);
 }

package/lib/action/presenceGroupLastLeftAction.d.ts

@@ -1,7 +1,7 @@
-import { CommandType } from '../enums';
+import { CommandSource, CommandType } from '../enums';
 import { BaseAction } from './baseAction';
 export declare class PresenceGroupLastLeftAction extends BaseAction {
     /** @inheritDoc */
     type: CommandType;
-    constructor(source?: BaseAction, reason?: string);
+    constructor(source: BaseAction | CommandSource, reason?: string);
 }

package/lib/action/shutterPositionChangedAction.js

@@ -5,7 +5,7 @@ const baseAction_1 = require("./baseAction");
 const enums_1 = require("../enums");
 class ShutterPositionChangedAction extends baseAction_1.BaseAction {
     constructor(shutter, newPosition) {
-        super(undefined, `${shutter.customName} changed position to ${newPosition}`);
+        super(enums_1.CommandSource.Automatic, `${shutter.customName} changed position to ${newPosition}`);
         this.newPosition = newPosition;
         /** @inheritDoc */
         this.type = enums_1.CommandType.ShutterPositionChangedAction;

package/lib/action/temperatureSensorChangeAction.js

@@ -5,7 +5,7 @@ const baseAction_1 = require("./baseAction");
 const enums_1 = require("../enums");
 class TemperatureSensorChangeAction extends baseAction_1.BaseAction {
     constructor(sensor, newTemperature) {
-        super(undefined, `${sensor.customName} detected ${newTemperature} °C`);
+        super(enums_1.CommandSource.Automatic, `${sensor.customName} detected ${newTemperature} °C`);
         /** @inheritDoc */
         this.type = enums_1.CommandType.TemperatureSensorChangeAction;
         this.newTemperature = newTemperature;

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 instanceof BaseCommand) {
             return `${this.source.reasonTrace} -> ${ownPart}`;
         }
         return `CommandType("${enums_1.CommandSource[this.source]}") stack => ${ownPart}`;

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/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;