hoffmation-base 3.3.1 → 3.3.3

package/lib/devices/zigbee/BaseDevices/zigbeeMotionSensor.d.ts

@@ -16,7 +16,7 @@ export declare class ZigbeeMotionSensor extends ZigbeeDevice implements iMotionS
     protected _movementDetectedCallback: Array<(action: MotionSensorAction) => void>;
     protected _needsMovementResetFallback: boolean;
     protected _fallBackTimeout: NodeJS.Timeout | undefined;
-    protected _timeSinceLastMotion: number;
+    protected _motionDetectedTimestamp: number;
     protected readonly _occupancyStateId: string;
     private _movementDetected;
     constructor(pInfo: IoBrokerDeviceInfo, type: DeviceType);

package/lib/devices/zigbee/BaseDevices/zigbeeMotionSensor.js

@@ -20,7 +20,7 @@ class ZigbeeMotionSensor extends zigbeeDevice_1.ZigbeeDevice {
         this._initialized = false;
         this._movementDetectedCallback = [];
         this._needsMovementResetFallback = true;
-        this._timeSinceLastMotion = 0;
+        this._motionDetectedTimestamp = 0;
         this._occupancyStateId = 'occupancy';
         this._movementDetected = false;
         this.deviceCapabilities.push(enums_1.DeviceCapability.motionSensor);
@@ -60,7 +60,10 @@ class ZigbeeMotionSensor extends zigbeeDevice_1.ZigbeeDevice {
     // Time since last motion in seconds
     /** @inheritDoc */
     get timeSinceLastMotion() {
-        return this._timeSinceLastMotion;
+        if (this._motionDetectedTimestamp === 0) {
+            return 0;
+        }
+        return (utils_1.Utils.nowMS() - this._motionDetectedTimestamp) / 1000;
     }
     /**
      * Adds a callback for when a motion state has changed.
@@ -83,6 +86,9 @@ class ZigbeeMotionSensor extends zigbeeDevice_1.ZigbeeDevice {
             }, 1000, this);
             return;
         }
+        else if (newState) {
+            this._motionDetectedTimestamp = utils_1.Utils.nowMS();
+        }
         if (newState === this._movementDetected) {
             this.log(enums_1.LogLevel.Debug, `Skip movement because state is already ${newState}`, enums_1.LogDebugType.SkipUnchangedMovementState);
             if (newState) {
@@ -120,10 +126,6 @@ class ZigbeeMotionSensor extends zigbeeDevice_1.ZigbeeDevice {
                 this.log(enums_1.LogLevel.Trace, `Motion sensor: Update for motion state of ${this.info.customName}: ${state.val}`);
                 this.updateMovement(state.val);
                 break;
-            case 'no_motion':
-                this.log(state.val < 100 ? enums_1.LogLevel.Trace : enums_1.LogLevel.DeepTrace, `Motion sensor: Update for time since last motion of ${this.info.customName}: ${state.val}`);
-                this._timeSinceLastMotion = state.val;
-                break;
         }
     }
     resetFallbackTimeout() {

package/lib/models/timeCallback.d.ts

@@ -25,4 +25,5 @@ export declare class TimeCallback implements ITimeCallback {
     constructor(name: string, type: TimeCallbackType, cFunction: () => void, minuteOffset: number, hours?: number | undefined, minutes?: number | undefined, sunTimeOffset?: SunTimeOffsets | undefined, cloudOffset?: number | undefined);
     recalcNextToDo(now: Date): void;
     perform(now?: Date): void;
+    toJSON(): Partial<TimeCallback>;
 }

package/lib/models/timeCallback.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.TimeCallback = void 0;
 const enums_1 = require("../enums");
 const services_1 = require("../services");
 const utils_1 = require("../utils");
 const logging_1 = require("../logging");
+const lodash_1 = __importDefault(require("lodash"));
 class TimeCallback {
     get calculationSunrise() {
         var _a;
@@ -112,5 +116,8 @@ class TimeCallback {
         this._calculationSunset = undefined;
         this.cFunction();
     }
+    toJSON() {
+        return utils_1.Utils.jsonFilter(lodash_1.default.omit(this, ['cFunction']));
+    }
 }
 exports.TimeCallback = TimeCallback;

package/lib/services/RoomBase.d.ts

@@ -1,9 +1,9 @@
 import { BaseGroup, DeviceCluster, HeatGroup, TasterGroup, WaterGroup } from '../devices';
 import { RoomSetLightTimeBasedCommand } from '../command';
-import { iIdHolder, iLightGroup, iPresenceGroup, iRoomBase, iSmokeGroup, iSpeakerGroup, ITimeCallback, iTrilaterationPoint, iWindowGroup } from '../interfaces';
+import { iIdHolder, iJsonCustomPrepend, iLightGroup, iPresenceGroup, iRoomBase, iSmokeGroup, iSpeakerGroup, ITimeCallback, iTrilaterationPoint, iWindowGroup } from '../interfaces';
 import { GroupType, LogLevel } from '../enums';
 import { RoomInfo, RoomSettingsController } from '../models';
-export declare class RoomBase implements iRoomBase, iIdHolder {
+export declare class RoomBase implements iRoomBase, iIdHolder, iJsonCustomPrepend {
     groupMap: Map<GroupType, BaseGroup>;
     startPoint?: iTrilaterationPoint | undefined;
     endPoint?: iTrilaterationPoint | undefined;
@@ -49,6 +49,7 @@ export declare class RoomBase implements iRoomBase, iIdHolder {
      */
     setLightTimeBased(c: RoomSetLightTimeBasedCommand): void;
     isNowLightTime(): boolean;
+    customPrepend(): Partial<unknown>;
     toJSON(): Partial<iRoomBase & {
         /**
          * The dictionary representation of the group map

package/lib/services/RoomBase.js

@@ -164,8 +164,22 @@ class RoomBase {
         }
         return time_callback_service_1.TimeCallbackService.darkOutsideOrNight(timeOfDay);
     }
+    customPrepend() {
+        return {
+            sunriseShutterCallback: this.sunriseShutterCallback,
+            sunsetShutterCallback: this.sunsetShutterCallback,
+            sonnenUntergangLichtCallback: this.sonnenUntergangLichtCallback,
+            sonnenAufgangLichtCallback: this.sonnenAufgangLichtCallback,
+        };
+    }
     toJSON() {
-        return utils_1.Utils.jsonFilter(lodash_1.default.omit(this, ['_deviceCluster']));
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        const result = utils_1.Utils.jsonFilter(lodash_1.default.omit(this, ['_deviceCluster']));
+        result['sunriseShutterCallback'] = this.sunriseShutterCallback;
+        result['sunsetShutterCallback'] = this.sunsetShutterCallback;
+        result['sonnenUntergangLichtCallback'] = this.sonnenUntergangLichtCallback;
+        result['sonnenAufgangLichtCallback'] = this.sonnenAufgangLichtCallback;
+        return result;
     }
     log(level, message) {
         logging_1.ServerLogService.writeLog(level, message, {