From 7bc3cccdcbe87e256d53ac95949798981b673119 Mon Sep 17 00:00:00 2001
From: Hypnos <12692680+Hypnos3@users.noreply.github.com>
Date: Tue, 15 Feb 2022 11:55:19 +0100
Subject: [PATCH] 2.1.1: bug fixes

- clock-timer
  - merged with blind-control
---
 CHANGELOG.md           |  6 ++++++
 nodes/blind-control.js |  2 +-
 nodes/clock-timer.js   | 11 ++---------
 package.json           |  6 +++---
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2013662..8001664 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,10 +14,16 @@ Install of a specific Version in Redmatic (on a Homematic):
   - `npm install --save --no-package-lock --global-style --save-prefix="~" --production node-red-contrib-sun-position@2.0.0`
 
 This can be also used to go back to an older Version.
+### 2.1.1: bug fixes
+
+- clock-timer
+  - merged with blind-control
+
 ### 2.1.0: bug fixes
 
 - blind-control
   - fix bug of handling not time constrained rules be first to last evaluated
+  
 ### 2.0.13: bug fixes
 
 - general
diff --git a/nodes/blind-control.js b/nodes/blind-control.js
index ff4e59d..646435b 100644
--- a/nodes/blind-control.js
+++ b/nodes/blind-control.js
@@ -240,7 +240,7 @@ module.exports = function (RED) {
         }
         let newPos = hlp.getMsgNumberValue(msg, ['blindPosition', 'position', 'level', 'blindLevel'], ['manual', 'levelOverwrite']);
         let nExpire = hlp.getMsgNumberValue(msg, 'expire', 'expire');
-        if (String(msg.topic).includes('noExpir')) { // hlp.getMsgTopicContains(msg, 'noExpir')) {
+        if (msg.topic && String(msg.topic).includes('noExpir')) { // hlp.getMsgTopicContains(msg, 'noExpir')) {
             nExpire = -1;
         }
         if (!isNaN(newPos)) {
diff --git a/nodes/clock-timer.js b/nodes/clock-timer.js
index 6698bdf..dc97b7c 100644
--- a/nodes/clock-timer.js
+++ b/nodes/clock-timer.js
@@ -188,19 +188,12 @@ module.exports = function (RED) {
             if (!rule.enabled) { continue; }
             if (rule.time && rule.time.operator === cRuleFrom) { continue; }
             // const res = fktCheck(rule, r => (r >= nowNr));
-            let res = null;
-            if (!rule.time || rule.time.operator === cRuleFrom) {
-                res = ctrlLib.compareRules(node, msg, rule, r => (r <= oNow.nowNr), oNow);
-            } else {
-                res = ctrlLib.compareRules(node, msg, rule, r => (r >= oNow.nowNr), oNow);
-            }
+            const res = ctrlLib.compareRules(node, msg, rule, r => (r >= oNow.nowNr), oNow);
             if (res) {
                 // node.debug(`1. ruleSel ${rule.name} (${rule.pos}) data=${ util.inspect(res, { colors: true, compact: 10, breakLength: Infinity }) }`);
                 ruleSel = res;
                 ruleindex = i;
-                if (rule.time && rule.time.operator !== cRuleFrom) {
-                    break;
-                }
+                break;
             }
         }
 
diff --git a/package.json b/package.json
index 37a0f86..d8467f8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-sun-position",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "NodeRED nodes to get sun and moon position",
   "keywords": [
     "node-red",
@@ -111,9 +111,9 @@
     "lodash.isequal": "^4.5.0"
   },
   "devDependencies": {
-    "eslint": ">=8.8.0",
+    "eslint": ">=8.9.0",
     "eslint-plugin-html": ">=6.2.0",
-    "eslint-plugin-jsdoc": ">=37.8.2",
+    "eslint-plugin-jsdoc": ">=37.9.1",
     "eslint-plugin-json": ">=3.1.0",
     "eslint-plugin-node": ">=11.1.0",
     "node-red-dev": "^0.1.5"