@atolis-hq/wake 0.3.17 → 0.3.18

package/dist/src/bootstrap/version.js

@@ -108,4 +108,4 @@ export function resolveWakeVersion(options = {}) {
         return `g${headHash.slice(0, 7)}`;
     return '0.1.0-dev';
 }
-export const wakeVersion = "g4cf4a17";
+export const wakeVersion = "gaebb12d";

package/dist/src/control-plane/domain/schedule-policy.js

@@ -1,3 +1,4 @@
+import { CronExpressionParser } from 'cron-parser';
 export class SchedulePolicy {
     elapsedSlots(config, now, checkpoint) {
         const end = minute(new Date(now));
@@ -7,13 +8,22 @@ export class SchedulePolicy {
         const fields = config.cron.trim().split(/\s+/);
         if (fields.length !== 5)
             throw new Error(`Schedule ${config.id} must use a five-field cron expression`);
+        if (fields.some(hasUnsupportedSyntax))
+            throw new Error(`Schedule ${config.id} uses unsupported cron syntax`);
+        const expression = CronExpressionParser.parse(config.cron, {
+            currentDate: new Date(start - 1),
+            endDate: new Date(end),
+            tz: 'UTC',
+        });
+        const dayOfMonth = fieldExpression(fields, 2, 4);
+        const dayOfWeek = fieldExpression(fields, 4, 2);
         const slots = [];
-        for (let cursor = start; cursor <= end; cursor += 60_000) {
-            const date = new Date(cursor);
-            if (matches(fields, date)) {
-                const at = date.toISOString();
-                slots.push({ identity: `schedule:${config.id}:${at}`, at });
-            }
+        while (expression.hasNext()) {
+            const date = expression.next().toDate();
+            if (!matchesDays(date, dayOfMonth, dayOfWeek))
+                continue;
+            const at = date.toISOString();
+            slots.push({ identity: `schedule:${config.id}:${at}`, at });
         }
         return slots;
     }
@@ -23,24 +33,16 @@ function minute(value) {
         throw new Error('Schedule timestamps must be valid dates');
     return Math.floor(value.getTime() / 60_000) * 60_000;
 }
-function matches(fields, date) {
-    return (matchesField(fields[0], date.getUTCMinutes(), 0, 59) &&
-        matchesField(fields[1], date.getUTCHours(), 0, 23) &&
-        matchesField(fields[2], date.getUTCDate(), 1, 31) &&
-        matchesField(fields[3], date.getUTCMonth() + 1, 1, 12) &&
-        matchesField(fields[4], date.getUTCDay(), 0, 6));
+function hasUnsupportedSyntax(field) {
+    return /[?#]|(^|[,*/-])H(?=$|[,*/-])|(^|[,*/-])L(?=$|[,*/-])|\dL\b/i.test(field);
 }
-function matchesField(expression, value, minimum, maximum) {
-    return expression.split(',').some((part) => {
-        const [base, stepText] = part.split('/');
-        const step = stepText === undefined ? 1 : Number(stepText);
-        if (!Number.isInteger(step) || step < 1)
-            throw new Error(`Invalid cron step: ${part}`);
-        if (base === '*')
-            return (value - minimum) % step === 0;
-        const number = Number(base);
-        if (!Number.isInteger(number) || number < minimum || number > maximum)
-            throw new Error(`Invalid cron field: ${part}`);
-        return value === number;
-    });
+function fieldExpression(fields, index, wildcardIndex) {
+    if (fields[index] === '*')
+        return null;
+    const constrained = [...fields];
+    constrained[wildcardIndex] = '*';
+    return CronExpressionParser.parse(constrained.join(' '), { tz: 'UTC' });
+}
+function matchesDays(date, dayOfMonth, dayOfWeek) {
+    return (dayOfMonth?.includesDate(date) ?? true) && (dayOfWeek?.includesDate(date) ?? true);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atolis-hq/wake",
-  "version": "0.3.17",
+  "version": "0.3.18",
   "description": "Local autonomous agent control plane for software development",
   "license": "Apache-2.0",
   "repository": {
@@ -66,6 +66,7 @@
   },
   "dependencies": {
     "@octokit/rest": "^22.0.0",
+    "cron-parser": "^5.10.0",
     "execa": "^10.0.1",
     "handlebars": "^4.7.9",
     "ulid": "^3.0.2",