@unchainedshop/core 4.6.2 → 4.7.2

package/lib/utils/schedule.js

@@ -99,37 +99,173 @@ function parseText(text) {
             throw new Error(`Unsupported time unit: ${unit}`);
     }
 }
+function findNextInSorted(sorted, minVal) {
+    for (const v of sorted) {
+        if (v >= minVal)
+            return v;
+    }
+    return null;
+}
+function daysInMonth(year, month) {
+    return new Date(year, month, 0).getDate();
+}
 function getNextOccurrences(scheduleData, count, referenceDate) {
     const results = [];
-    const schedule = scheduleData.schedules[0];
-    const current = new Date(referenceDate.getTime());
-    current.setMilliseconds(0);
-    current.setSeconds(current.getSeconds() + 1);
-    const maxIterations = 366 * 24 * 60 * 60;
-    let iterations = 0;
-    while (results.length < count && iterations < maxIterations) {
-        iterations++;
-        const month = current.getMonth() + 1;
-        const dayOfMonth = current.getDate();
-        const dayOfWeek = current.getDay();
-        const hour = current.getHours();
-        const minute = current.getMinutes();
-        const second = current.getSeconds();
-        const matchesMonth = !schedule.M || schedule.M.includes(month);
-        const matchesDay = !schedule.D || schedule.D.includes(dayOfMonth);
-        const matchesDayOfWeek = !schedule.d || schedule.d.includes(dayOfWeek);
-        const matchesHour = !schedule.h || schedule.h.includes(hour);
-        const matchesMinute = !schedule.m || schedule.m.includes(minute);
-        const matchesSecond = !schedule.s || schedule.s.includes(second);
-        if (matchesMonth &&
-            matchesDay &&
-            matchesDayOfWeek &&
-            matchesHour &&
-            matchesMinute &&
-            matchesSecond) {
-            results.push(new Date(current));
+    const sched = scheduleData.schedules[0];
+    const start = new Date(referenceDate.getTime());
+    start.setMilliseconds(0);
+    start.setSeconds(start.getSeconds() + 1);
+    let year = start.getFullYear();
+    let month = start.getMonth() + 1;
+    let day = start.getDate();
+    let hour = start.getHours();
+    let minute = start.getMinutes();
+    let second = start.getSeconds();
+    const maxYear = year + 5;
+    search: while (results.length < count && year <= maxYear) {
+        if (sched.M) {
+            const nextMonth = findNextInSorted(sched.M, month);
+            if (nextMonth === null) {
+                year++;
+                month = sched.M[0];
+                day = sched.D ? sched.D[0] : 1;
+                hour = sched.h ? sched.h[0] : 0;
+                minute = sched.m ? sched.m[0] : 0;
+                second = sched.s ? sched.s[0] : 0;
+                continue search;
+            }
+            if (nextMonth > month) {
+                month = nextMonth;
+                day = sched.D ? sched.D[0] : 1;
+                hour = sched.h ? sched.h[0] : 0;
+                minute = sched.m ? sched.m[0] : 0;
+                second = sched.s ? sched.s[0] : 0;
+            }
+        }
+        const maxDay = daysInMonth(year, month);
+        if (sched.D || sched.d) {
+            let found = false;
+            let candidateDay = day;
+            while (candidateDay <= maxDay) {
+                const matchesD = !sched.D || sched.D.includes(candidateDay);
+                if (matchesD) {
+                    const dow = new Date(year, month - 1, candidateDay).getDay();
+                    const matchesDow = !sched.d || sched.d.includes(dow);
+                    if (matchesDow) {
+                        if (candidateDay > day) {
+                            hour = sched.h ? sched.h[0] : 0;
+                            minute = sched.m ? sched.m[0] : 0;
+                            second = sched.s ? sched.s[0] : 0;
+                        }
+                        day = candidateDay;
+                        found = true;
+                        break;
+                    }
+                }
+                candidateDay++;
+            }
+            if (!found) {
+                month++;
+                if (month > 12) {
+                    year++;
+                    month = sched.M ? sched.M[0] : 1;
+                }
+                else if (sched.M) {
+                    const nextM = findNextInSorted(sched.M, month);
+                    if (nextM === null) {
+                        year++;
+                        month = sched.M[0];
+                    }
+                    else {
+                        month = nextM;
+                    }
+                }
+                day = sched.D ? sched.D[0] : 1;
+                hour = sched.h ? sched.h[0] : 0;
+                minute = sched.m ? sched.m[0] : 0;
+                second = sched.s ? sched.s[0] : 0;
+                continue search;
+            }
+        }
+        else if (day > maxDay) {
+            month++;
+            if (month > 12) {
+                year++;
+                month = sched.M ? sched.M[0] : 1;
+            }
+            else if (sched.M) {
+                const nextM = findNextInSorted(sched.M, month);
+                if (nextM === null) {
+                    year++;
+                    month = sched.M[0];
+                }
+                else {
+                    month = nextM;
+                }
+            }
+            day = 1;
+            hour = sched.h ? sched.h[0] : 0;
+            minute = sched.m ? sched.m[0] : 0;
+            second = sched.s ? sched.s[0] : 0;
+            continue search;
+        }
+        if (hour > 23) {
+            day++;
+            hour = sched.h ? sched.h[0] : 0;
+            minute = sched.m ? sched.m[0] : 0;
+            second = sched.s ? sched.s[0] : 0;
+            continue search;
+        }
+        if (sched.h) {
+            const nextHour = findNextInSorted(sched.h, hour);
+            if (nextHour === null) {
+                day++;
+                hour = sched.h[0];
+                minute = sched.m ? sched.m[0] : 0;
+                second = sched.s ? sched.s[0] : 0;
+                continue search;
+            }
+            if (nextHour > hour) {
+                hour = nextHour;
+                minute = sched.m ? sched.m[0] : 0;
+                second = sched.s ? sched.s[0] : 0;
+            }
+        }
+        if (minute > 59) {
+            hour++;
+            minute = sched.m ? sched.m[0] : 0;
+            second = sched.s ? sched.s[0] : 0;
+            continue search;
+        }
+        if (sched.m) {
+            const nextMinute = findNextInSorted(sched.m, minute);
+            if (nextMinute === null) {
+                hour++;
+                minute = sched.m[0];
+                second = sched.s ? sched.s[0] : 0;
+                continue search;
+            }
+            if (nextMinute > minute) {
+                minute = nextMinute;
+                second = sched.s ? sched.s[0] : 0;
+            }
+        }
+        if (second > 59) {
+            minute++;
+            second = sched.s ? sched.s[0] : 0;
+            continue search;
+        }
+        if (sched.s) {
+            const nextSecond = findNextInSorted(sched.s, second);
+            if (nextSecond === null) {
+                minute++;
+                second = sched.s[0];
+                continue search;
+            }
+            second = nextSecond;
         }
-        current.setSeconds(current.getSeconds() + 1);
+        results.push(new Date(year, month - 1, day, hour, minute, second));
+        second++;
     }
     return results;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unchainedshop/core",
   "description": "Core orchestration package for the Unchained Engine with business services and directors",
-  "version": "4.6.2",
+  "version": "4.7.2",
   "main": "lib/core-index.js",
   "types": "lib/core-index.d.ts",
   "type": "module",