@meetploy/cli 1.16.0 → 1.17.0

package/dist/dev.js

@@ -7,9 +7,9 @@ import 'esbuild';
 import 'chokidar';
 import { promisify } from 'util';
 import { parse } from 'yaml';
+import { randomUUID, createHmac, pbkdf2Sync, timingSafeEqual, randomBytes } from 'crypto';
 import { serve } from '@hono/node-server';
 import { Hono } from 'hono';
-import { randomUUID, createHmac, pbkdf2Sync, timingSafeEqual, randomBytes } from 'crypto';
 import 'os';
 import { getCookie, deleteCookie, setCookie } from 'hono/cookie';
 import Database from 'better-sqlite3';
@@ -380,6 +380,7 @@ function createDashboardRoutes(app, dbManager2, config) {
       state: config.state,
       fs: config.fs,
       workflow: config.workflow,
+      cron: config.cron,
       auth: config.auth
     });
   });
@@ -904,6 +905,36 @@ function createDashboardRoutes(app, dbManager2, config) {
       return c.json({ error: err instanceof Error ? err.message : String(err) }, 500);
     }
   });
+  app.get("/api/cron/:binding/executions", (c) => {
+    const binding = c.req.param("binding");
+    const cronExpression = config.cron?.[binding];
+    const limit = parseInt(c.req.query("limit") ?? "20", 10);
+    if (!cronExpression) {
+      return c.json({ error: "Cron binding not found" }, 404);
+    }
+    try {
+      const db = dbManager2.emulatorDb;
+      const executions = db.prepare(`SELECT id, cron_name, cron_expression, status, error, duration_ms, triggered_at, completed_at, created_at
+					 FROM cron_executions
+					 WHERE cron_name = ?
+					 ORDER BY triggered_at DESC
+					 LIMIT ?`).all(binding, limit);
+      return c.json({
+        cronExpression,
+        executions: executions.map((e) => ({
+          id: e.id,
+          status: e.status.toUpperCase(),
+          error: e.error,
+          durationMs: e.duration_ms,
+          triggeredAt: new Date(e.triggered_at * 1e3).toISOString(),
+          completedAt: e.completed_at ? new Date(e.completed_at * 1e3).toISOString() : null,
+          createdAt: new Date(e.created_at * 1e3).toISOString()
+        }))
+      });
+    } catch (err) {
+      return c.json({ error: err instanceof Error ? err.message : String(err) }, 500);
+    }
+  });
   if (hasDashboard) {
     app.get("/assets/*", (c) => {
       const path = c.req.path;
@@ -1654,6 +1685,22 @@ CREATE TABLE IF NOT EXISTS fs_entries (
   created_at INTEGER DEFAULT (strftime('%s', 'now')),
   PRIMARY KEY (fs_name, key)
 );
+
+-- Cron executions table
+CREATE TABLE IF NOT EXISTS cron_executions (
+  id TEXT PRIMARY KEY,
+  cron_name TEXT NOT NULL,
+  cron_expression TEXT NOT NULL,
+  status TEXT DEFAULT 'running',
+  error TEXT,
+  duration_ms INTEGER,
+  triggered_at INTEGER NOT NULL,
+  completed_at INTEGER,
+  created_at INTEGER DEFAULT (strftime('%s', 'now'))
+);
+
+CREATE INDEX IF NOT EXISTS idx_cron_executions_name
+  ON cron_executions(cron_name, triggered_at);
 `;
 function initializeDatabases(projectDir) {
   const dataDir = ensureDataDir(projectDir);

package/dist/index.js

@@ -147,6 +147,22 @@ function validateBindings(bindings, bindingType, configFile) {
     }
   }
 }
+function validateCronBindings(bindings, configFile) {
+  if (bindings === void 0) {
+    return;
+  }
+  for (const [bindingName, cronExpression] of Object.entries(bindings)) {
+    if (!BINDING_NAME_REGEX.test(bindingName)) {
+      throw new Error(`Invalid cron binding name '${bindingName}' in ${configFile}. Binding names must be uppercase with underscores (e.g., HOURLY_CLEANUP, DAILY_REPORT)`);
+    }
+    if (typeof cronExpression !== "string") {
+      throw new Error(`Cron binding '${bindingName}' in ${configFile} must have a string value (cron expression)`);
+    }
+    if (!CRON_EXPRESSION_REGEX.test(cronExpression.trim())) {
+      throw new Error(`Invalid cron expression '${cronExpression}' for binding '${bindingName}' in ${configFile}. Must be a valid cron expression with 5 fields (e.g., "0 * * * *", "*/5 * * * *")`);
+    }
+  }
+}
 function validateRelativePath(path, fieldName, configFile) {
   if (path === void 0) {
     return void 0;
@@ -202,6 +218,7 @@ function validatePloyConfig(config, configFile = "ploy.yaml", options = {}) {
   validateBindings(config.state, "state", configFile);
   validateBindings(config.fs, "fs", configFile);
   validateBindings(config.workflow, "workflow", configFile);
+  validateCronBindings(config.cron, configFile);
   if (config.ai !== void 0 && typeof config.ai !== "boolean") {
     throw new Error(`'ai' in ${configFile} must be a boolean`);
   }
@@ -277,7 +294,7 @@ function readAndValidatePloyConfigSync(projectDir, configPath, validationOptions
   return validatePloyConfig(config, configFile, validationOptions);
 }
 function hasBindings(config) {
-  return !!(config.env ?? config.db ?? config.queue ?? config.cache ?? config.state ?? config.fs ?? config.workflow ?? config.ai ?? config.auth);
+  return !!(config.env ?? config.db ?? config.queue ?? config.cache ?? config.state ?? config.fs ?? config.workflow ?? config.cron ?? config.ai ?? config.auth);
 }
 function parseDotEnv(content) {
   const result = {};
@@ -339,7 +356,7 @@ function getWorkerEntryPoint(projectDir, config) {
   }
   throw new Error("Could not find worker entry point. Specify 'main' in ploy.yaml");
 }
-var readFileAsync, DEFAULT_COMPATIBILITY_FLAGS, DEFAULT_COMPATIBILITY_DATE, BINDING_NAME_REGEX, RESOURCE_NAME_REGEX;
+var readFileAsync, DEFAULT_COMPATIBILITY_FLAGS, DEFAULT_COMPATIBILITY_DATE, BINDING_NAME_REGEX, RESOURCE_NAME_REGEX, CRON_EXPRESSION_REGEX;
 var init_ploy_config = __esm({
   "../tools/dist/ploy-config.js"() {
     readFileAsync = promisify(readFile$1);
@@ -347,6 +364,7 @@ var init_ploy_config = __esm({
     DEFAULT_COMPATIBILITY_DATE = "2025-04-02";
     BINDING_NAME_REGEX = /^[A-Z][A-Z0-9_]*$/;
     RESOURCE_NAME_REGEX = /^[a-z][a-z0-9_]*$/;
+    CRON_EXPRESSION_REGEX = /^(\*|[0-9,\-/]+)\s+(\*|[0-9,\-/]+)\s+(\*|[0-9,\-/]+)\s+(\*|[0-9,\-/]+)\s+(\*|[0-9,\-/]+)$/;
   }
 });
 
@@ -1280,6 +1298,37 @@ function generateWrapperCode(config, mockServiceUrl, envVars) {
       }
     }
   }` : "";
+  const cronHandlerCode = config.cron ? `
+  // Handle cron trigger delivery
+  if (request.headers.get("X-Ploy-Cron-Trigger") === "true") {
+    const cronExpression = request.headers.get("X-Ploy-Cron-Expression");
+    const scheduledTime = parseInt(request.headers.get("X-Ploy-Cron-Scheduled-Time") || String(Date.now()), 10);
+
+    if (cronExpression && userWorker.scheduled) {
+      let noRetryFlag = false;
+      const event = {
+        cron: cronExpression,
+        scheduledTime,
+        noRetry() { noRetryFlag = true; }
+      };
+      try {
+        await userWorker.scheduled(event, injectedEnv, ctx);
+        return new Response(JSON.stringify({ success: true, noRetry: noRetryFlag }), {
+          headers: { "Content-Type": "application/json" }
+        });
+      } catch (error) {
+        return new Response(JSON.stringify({ success: false, error: String(error) }), {
+          status: 500,
+          headers: { "Content-Type": "application/json" }
+        });
+      }
+    }
+
+    return new Response(JSON.stringify({ success: false, error: "No scheduled handler defined" }), {
+      status: 404,
+      headers: { "Content-Type": "application/json" }
+    });
+  }` : "";
   const queueHandlerCode = config.queue ? `
   // Handle queue message delivery
   if (request.headers.get("X-Ploy-Queue-Delivery") === "true") {
@@ -1323,6 +1372,7 @@ ${bindings.join("\n")}
 export default {
   async fetch(request, env, ctx) {
     const injectedEnv = { ...env, ...ployBindings };${envVarsCode}
+    ${cronHandlerCode}
     ${workflowHandlerCode}
     ${queueHandlerCode}
 
@@ -1693,6 +1743,177 @@ var init_workerd_config = __esm({
   "../emulator/dist/config/workerd-config.js"() {
   }
 });
+function parseCronField(field, min, max) {
+  const values = /* @__PURE__ */ new Set();
+  for (const part of field.split(",")) {
+    const trimmed = part.trim();
+    if (trimmed === "*") {
+      for (let i = min; i <= max; i++) {
+        values.add(i);
+      }
+      continue;
+    }
+    const stepMatch = trimmed.match(/^(.+)\/(\d+)$/);
+    if (stepMatch) {
+      const step = parseInt(stepMatch[2], 10);
+      const base = stepMatch[1];
+      let start = min;
+      let end = max;
+      if (base !== "*") {
+        const rangeMatch2 = base.match(/^(\d+)-(\d+)$/);
+        if (rangeMatch2) {
+          start = parseInt(rangeMatch2[1], 10);
+          end = parseInt(rangeMatch2[2], 10);
+        } else {
+          start = parseInt(base, 10);
+        }
+      }
+      if (start < min || start > max || end < min || end > max) {
+        throw new Error(`Cron field range ${start}-${end} is out of bounds (${min}-${max})`);
+      }
+      for (let i = start; i <= end; i += step) {
+        values.add(i);
+      }
+      continue;
+    }
+    const rangeMatch = trimmed.match(/^(\d+)-(\d+)$/);
+    if (rangeMatch) {
+      const start = parseInt(rangeMatch[1], 10);
+      const end = parseInt(rangeMatch[2], 10);
+      if (start < min || start > max || end < min || end > max) {
+        throw new Error(`Cron field range ${start}-${end} is out of bounds (${min}-${max})`);
+      }
+      for (let i = start; i <= end; i++) {
+        values.add(i);
+      }
+      continue;
+    }
+    const num = parseInt(trimmed, 10);
+    if (isNaN(num)) {
+      throw new Error(`Invalid cron field value: '${trimmed}' (expected number, range, step, or wildcard)`);
+    }
+    if (num < min || num > max) {
+      throw new Error(`Cron field value ${num} is out of range (${min}-${max})`);
+    }
+    values.add(num);
+  }
+  return { values };
+}
+function parseCronExpression(expression) {
+  const parts = expression.trim().split(/\s+/);
+  if (parts.length !== 5) {
+    throw new Error(`Invalid cron expression: ${expression} (expected 5 fields)`);
+  }
+  return [
+    parseCronField(parts[0], 0, 59),
+    parseCronField(parts[1], 0, 23),
+    parseCronField(parts[2], 1, 31),
+    parseCronField(parts[3], 1, 12),
+    parseCronField(parts[4], 0, 6)
+  ];
+}
+function cronMatchesDate(fields, date) {
+  const minute = date.getMinutes();
+  const hour = date.getHours();
+  const dayOfMonth = date.getDate();
+  const month = date.getMonth() + 1;
+  const dayOfWeek = date.getDay();
+  return fields[0].values.has(minute) && fields[1].values.has(hour) && fields[2].values.has(dayOfMonth) && fields[3].values.has(month) && fields[4].values.has(dayOfWeek);
+}
+function createCronScheduler(db, cronBindings, workerUrl) {
+  let interval = null;
+  const parsedCrons = /* @__PURE__ */ new Map();
+  let lastCheckedMinute = -1;
+  for (const [name, expression] of Object.entries(cronBindings)) {
+    try {
+      const fields = parseCronExpression(expression);
+      parsedCrons.set(name, { expression, fields });
+    } catch (err) {
+      error(`Failed to parse cron expression for '${name}': ${err instanceof Error ? err.message : String(err)}`);
+    }
+  }
+  async function checkCrons() {
+    const now = /* @__PURE__ */ new Date();
+    const currentMinute = Math.floor(now.getTime() / 6e4);
+    if (currentMinute === lastCheckedMinute) {
+      return;
+    }
+    lastCheckedMinute = currentMinute;
+    for (const [name, cron] of parsedCrons) {
+      if (cronMatchesDate(cron.fields, now)) {
+        await triggerScheduledHandler(db, name, cron.expression, now, workerUrl);
+      }
+    }
+  }
+  return {
+    start() {
+      if (interval) {
+        return;
+      }
+      log(`Cron scheduler started with ${parsedCrons.size} trigger(s)`);
+      for (const [name, cron] of parsedCrons) {
+        log(`  ${name}: ${cron.expression}`);
+      }
+      interval = setInterval(() => {
+        checkCrons().catch((err) => {
+          error(`Cron check error: ${err instanceof Error ? err.message : String(err)}`);
+        });
+      }, 15e3);
+      checkCrons().catch(() => {
+      });
+    },
+    stop() {
+      if (interval) {
+        clearInterval(interval);
+        interval = null;
+      }
+    }
+  };
+}
+async function triggerScheduledHandler(db, cronName, cronExpression, triggerTime, workerUrl) {
+  const executionId = randomUUID();
+  const now = Math.floor(Date.now() / 1e3);
+  db.prepare(`INSERT INTO cron_executions (id, cron_name, cron_expression, status, triggered_at)
+		 VALUES (?, ?, ?, 'running', ?)`).run(executionId, cronName, cronExpression, now);
+  log(`[cron] Triggering '${cronName}' (${cronExpression}) execution=${executionId}`);
+  try {
+    const response = await fetch(workerUrl, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        "X-Ploy-Cron-Trigger": "true",
+        "X-Ploy-Cron-Name": cronName,
+        "X-Ploy-Cron-Expression": cronExpression,
+        "X-Ploy-Cron-Execution-Id": executionId,
+        "X-Ploy-Cron-Scheduled-Time": String(triggerTime.getTime())
+      },
+      body: JSON.stringify({
+        cron: cronExpression,
+        scheduledTime: triggerTime.getTime()
+      })
+    });
+    const completedAt = Math.floor(Date.now() / 1e3);
+    const durationMs = Date.now() - triggerTime.getTime();
+    if (response.ok) {
+      db.prepare(`UPDATE cron_executions SET status = 'completed', completed_at = ?, duration_ms = ? WHERE id = ?`).run(completedAt, durationMs, executionId);
+      log(`[cron] '${cronName}' completed successfully (${durationMs}ms)`);
+    } else {
+      const errorText = await response.text();
+      db.prepare(`UPDATE cron_executions SET status = 'failed', completed_at = ?, duration_ms = ?, error = ? WHERE id = ?`).run(completedAt, durationMs, errorText, executionId);
+      error(`[cron] '${cronName}' failed: ${errorText}`);
+    }
+  } catch (err) {
+    const completedAt = Math.floor(Date.now() / 1e3);
+    const errorMessage = err instanceof Error ? err.message : String(err);
+    db.prepare(`UPDATE cron_executions SET status = 'failed', completed_at = ?, error = ? WHERE id = ?`).run(completedAt, errorMessage, executionId);
+    error(`[cron] '${cronName}' error: ${errorMessage}`);
+  }
+}
+var init_cron_service = __esm({
+  "../emulator/dist/services/cron-service.js"() {
+    init_logger();
+  }
+});
 function getProjectHash(projectDir) {
   return createHash("sha256").update(projectDir).digest("hex").slice(0, 12);
 }
@@ -2035,6 +2256,7 @@ function createDashboardRoutes(app, dbManager2, config) {
       state: config.state,
       fs: config.fs,
       workflow: config.workflow,
+      cron: config.cron,
       auth: config.auth
     });
   });
@@ -2559,6 +2781,36 @@ function createDashboardRoutes(app, dbManager2, config) {
       return c.json({ error: err instanceof Error ? err.message : String(err) }, 500);
     }
   });
+  app.get("/api/cron/:binding/executions", (c) => {
+    const binding = c.req.param("binding");
+    const cronExpression = config.cron?.[binding];
+    const limit = parseInt(c.req.query("limit") ?? "20", 10);
+    if (!cronExpression) {
+      return c.json({ error: "Cron binding not found" }, 404);
+    }
+    try {
+      const db = dbManager2.emulatorDb;
+      const executions = db.prepare(`SELECT id, cron_name, cron_expression, status, error, duration_ms, triggered_at, completed_at, created_at
+					 FROM cron_executions
+					 WHERE cron_name = ?
+					 ORDER BY triggered_at DESC
+					 LIMIT ?`).all(binding, limit);
+      return c.json({
+        cronExpression,
+        executions: executions.map((e) => ({
+          id: e.id,
+          status: e.status.toUpperCase(),
+          error: e.error,
+          durationMs: e.duration_ms,
+          triggeredAt: new Date(e.triggered_at * 1e3).toISOString(),
+          completedAt: e.completed_at ? new Date(e.completed_at * 1e3).toISOString() : null,
+          createdAt: new Date(e.created_at * 1e3).toISOString()
+        }))
+      });
+    } catch (err) {
+      return c.json({ error: err instanceof Error ? err.message : String(err) }, 500);
+    }
+  });
   if (hasDashboard) {
     app.get("/assets/*", (c) => {
       const path = c.req.path;
@@ -3463,6 +3715,22 @@ CREATE TABLE IF NOT EXISTS fs_entries (
   created_at INTEGER DEFAULT (strftime('%s', 'now')),
   PRIMARY KEY (fs_name, key)
 );
+
+-- Cron executions table
+CREATE TABLE IF NOT EXISTS cron_executions (
+  id TEXT PRIMARY KEY,
+  cron_name TEXT NOT NULL,
+  cron_expression TEXT NOT NULL,
+  status TEXT DEFAULT 'running',
+  error TEXT,
+  duration_ms INTEGER,
+  triggered_at INTEGER NOT NULL,
+  completed_at INTEGER,
+  created_at INTEGER DEFAULT (strftime('%s', 'now'))
+);
+
+CREATE INDEX IF NOT EXISTS idx_cron_executions_name
+  ON cron_executions(cron_name, triggered_at);
 `;
   }
 });
@@ -3479,6 +3747,7 @@ var init_emulator = __esm({
     init_env();
     init_ploy_config2();
     init_workerd_config();
+    init_cron_service();
     init_mock_server();
     init_queue_service();
     init_logger();
@@ -3494,6 +3763,7 @@ var init_emulator = __esm({
       workerdProcess = null;
       fileWatcher = null;
       queueProcessor = null;
+      cronScheduler = null;
       resolvedEnvVars = {};
       constructor(options = {}) {
         const port = options.port ?? 8787;
@@ -3561,6 +3831,12 @@ var init_emulator = __esm({
             this.queueProcessor.start();
             debug("Queue processor started", this.options.verbose);
           }
+          if (this.config.cron) {
+            const workerUrl2 = `http://${this.options.host}:${String(this.options.port)}`;
+            this.cronScheduler = createCronScheduler(this.dbManager.emulatorDb, this.config.cron, workerUrl2);
+            this.cronScheduler.start();
+            debug("Cron scheduler started", this.options.verbose);
+          }
           success(`Emulator running at http://${this.options.host}:${String(this.options.port)}`);
           log(`  Dashboard: http://${this.options.host}:${String(this.mockServer.port)}`);
           if (Object.keys(this.resolvedEnvVars).length > 0) {
@@ -3581,6 +3857,11 @@ var init_emulator = __esm({
           if (this.config.workflow) {
             log(`  Workflow bindings: ${Object.keys(this.config.workflow).join(", ")}`);
           }
+          if (this.config.cron) {
+            for (const [name, expr] of Object.entries(this.config.cron)) {
+              log(`  Cron: ${name} = ${expr}`);
+            }
+          }
           this.setupSignalHandlers();
         } catch (err) {
           error(`Failed to start emulator: ${err instanceof Error ? err.message : String(err)}`);
@@ -3705,6 +3986,10 @@ var init_emulator = __esm({
         process.on("SIGTERM", handler);
       }
       async stop() {
+        if (this.cronScheduler) {
+          this.cronScheduler.stop();
+          this.cronScheduler = null;
+        }
         if (this.queueProcessor) {
           this.queueProcessor.stop();
           this.queueProcessor = null;
@@ -5641,7 +5926,7 @@ async function typesCommand(options = {}) {
     console.error("Error: ploy.yaml not found in current directory");
     process.exit(1);
   }
-  const hasBindings2 = config.env || config.ai || config.db || config.queue || config.cache || config.state || config.workflow;
+  const hasBindings2 = config.env || config.ai || config.db || config.queue || config.cache || config.state || config.workflow || config.cron;
   if (!hasBindings2) {
     console.log("No bindings found in ploy.yaml. Generating empty Env.");
   }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@meetploy/cli",
-	"version": "1.16.0",
+	"version": "1.17.0",
 	"private": false,
 	"repository": {
 		"type": "git",