diff --git a/utils/watch.js b/utils/watch.js index c8911a5..01f8d8b 100644 --- a/utils/watch.js +++ b/utils/watch.js @@ -84,10 +84,18 @@ class Watch { isAlert(watchUUID) { log.debug('Check if there is a running alert for watchObject ' + watchUUID); if (watchUUID in this.#watchObjects) { + console.error(this.#watchObjects[watchUUID].alert); return this.#watchObjects[watchUUID].alert; } } + isDelayed(watchUUID) { + log.debug('Check if startAlert for watchObject ' + watchUUID + 'is delayed'); + if (watchUUID in this.#watchObjects) { + return this.#timers.isActive('startAlert ' + watchUUID);; + } + } + validateWatchConfig(params) { if (params['item'] === undefined) { @@ -164,7 +172,10 @@ class Watch { } #endAlert(watchUUID) { - log.info(`End alert for watchObject ${watchUUID} triggered`); + // Get itemName + let watchItemName = this.#watchObjects[watchUUID].item; + + log.info(`End alert for watchObject ${watchUUID} (${watchItemName}) triggered`); this.#watchObjects[watchUUID].alert = false; // Run end alert function if existing