iobroker.javascript 5.4.0 → 5.4.3

package/lib/scheduler.js

@@ -83,20 +83,15 @@ class Scheduler {
         for (const id in this.list) {
             if (!this.list.hasOwnProperty(id)) continue;
             if (this.checkSchedule(context, this.list[id])) {
-                typeof this.list[id].cb === 'function' && this.list[id].cb(id);
+                setImmediate(id => this.list[id] && typeof this.list[id].cb === 'function' && this.list[id].cb(id), id);
             }
         }
 
         const d = new this.Date();
-        // if callback last more than a minute
-        if (d.getTime() - context.now > 60000) {
-            setImmediate(() => this.checkSchedules());
-        } else {
-            d.setMilliseconds(0);
-            d.setSeconds(0);
-            d.setMinutes(d.getMinutes() + 1);
-            this.timer = setTimeout(() => this.checkSchedules(), d.getTime() - this.Date.now());
-        }
+        d.setMilliseconds(0);
+        d.setSeconds(0);
+        d.setMinutes(d.getMinutes() + 1);
+        this.timer = setTimeout(() => this.checkSchedules(), d.getTime() - this.Date.now());
     }
 
     monthDiff(d1, d2) {
@@ -145,7 +140,7 @@ class Scheduler {
                     }
                 }
             } else if (schedule.period.months) {
-                if (schedule.period.months && schedule.period.months.indexOf(context.M) === -1) {
+                if (Array.isArray(schedule.period.months) && schedule.period.months.indexOf(context.M) === -1) {
                     return;
                 }
                 if (schedule.period.fromDate && typeof schedule.period.months === 'number' && schedule.period.months > 1) {
@@ -154,6 +149,9 @@ class Scheduler {
                         return;
                     }
                 }
+                if (schedule.period.dates && schedule.period.dates.indexOf(context.d) === -1) {
+                    return;
+                }
             } else if (schedule.period.years) {
                 if (schedule.period.yearMonth !== undefined && schedule.period.yearMonth !== context.M) {
                     return;
@@ -327,7 +325,7 @@ class Scheduler {
                 return;
             }
         }
-        if (sch.period.months) {
+        if (sch.period.months && typeof sch.period.months !== 'number') { // can be number or array-string
             try {
                 sch.period.months = JSON.parse(sch.period.months);
             } catch (e) {

package/main.js

@@ -1376,7 +1376,7 @@ function createActiveObject(id, enabled, cb) {
             if (state && state.val !== enabled) {
                 const intermediateStateValue = prepareStateObject(idActive, !!enabled, true);
                 adapter.setForeignState(idActive, !!enabled, true, () => {
-                    if (!!enabled) {
+                    if (enabled) {
                         context.interimStateValues[id] = intermediateStateValue;
                     }
                     cb && cb();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.javascript",
-  "version": "5.4.0",
+  "version": "5.4.3",
   "description": "Rules Engine for ioBroker",
   "author": "bluefox <dogafox@gmail.com>",
   "contributors": [