@meetploy/cli 1.20.0 → 1.22.0

package/dist/dev.js

@@ -4,9 +4,9 @@ import { readFile, existsSync, readFileSync, mkdirSync, unlinkSync, writeFileSyn
 import { dirname, join } from 'path';
 import { fileURLToPath } from 'url';
 import 'esbuild';
-import 'chokidar';
 import { promisify } from 'util';
 import { parse } from 'yaml';
+import 'chokidar';
 import { randomUUID, createHmac, pbkdf2Sync, timingSafeEqual, randomBytes } from 'crypto';
 import { serve } from '@hono/node-server';
 import { Hono } from 'hono';
@@ -15,19 +15,18 @@ import { getCookie, deleteCookie, setCookie } from 'hono/cookie';
 import { DatabaseSync, backup } from 'node:sqlite';
 
 createRequire(import.meta.url);
-
-// ../emulator/dist/utils/logger.js
-var COLORS = {
-  reset: "\x1B[0m",
-  dim: "\x1B[2m",
-  red: "\x1B[31m"};
-function timestamp() {
-  return (/* @__PURE__ */ new Date()).toLocaleTimeString("en-US", { hour12: false });
+promisify(readFile);
+var DEFAULT_WORKFLOW_TIMEOUT_S = 10 * 60;
+var DEFAULT_STEP_TIMEOUT_S = 2 * 60;
+function getWorkflowName(value) {
+  return typeof value === "string" ? value : value.name;
 }
-function error(message) {
-  console.error(`${COLORS.dim}[${timestamp()}]${COLORS.reset} ${COLORS.red}[ploy]${COLORS.reset} ${message}`);
+function getWorkflowTimeout(value) {
+  return typeof value === "string" ? void 0 : value.timeout;
+}
+function getWorkflowStepTimeout(value) {
+  return typeof value === "string" ? void 0 : value.step_timeout;
 }
-promisify(readFile);
 function readPloyConfigSync(projectDir, configPath) {
   const configFile = configPath ?? "ploy.yaml";
   const fullPath = join(projectDir, configFile);
@@ -49,6 +48,22 @@ function readPloyConfig(projectDir, configPath) {
   }
   return config;
 }
+
+// ../emulator/dist/utils/logger.js
+var COLORS = {
+  reset: "\x1B[0m",
+  dim: "\x1B[2m",
+  yellow: "\x1B[33m",
+  red: "\x1B[31m"};
+function timestamp() {
+  return (/* @__PURE__ */ new Date()).toLocaleTimeString("en-US", { hour12: false });
+}
+function warn(message) {
+  console.log(`${COLORS.dim}[${timestamp()}]${COLORS.reset} ${COLORS.yellow}[ploy]${COLORS.reset} ${message}`);
+}
+function error(message) {
+  console.error(`${COLORS.dim}[${timestamp()}]${COLORS.reset} ${COLORS.red}[ploy]${COLORS.reset} ${message}`);
+}
 function getDataDir(projectDir) {
   return join(projectDir, ".ploy");
 }
@@ -561,7 +576,7 @@ function createDashboardRoutes(app, dbManager2, config) {
       return c.json({ error: "Query is required" }, 400);
     }
     try {
-      const db = dbManager2.getD1Database(resourceName);
+      const db = dbManager2.getDatabase(resourceName);
       const startTime = Date.now();
       const stmt = db.prepare(query);
       const isSelect = query.trim().toUpperCase().startsWith("SELECT");
@@ -599,7 +614,7 @@ function createDashboardRoutes(app, dbManager2, config) {
       return c.json({ error: `Database binding '${binding}' not found` }, 404);
     }
     try {
-      const db = dbManager2.getD1Database(resourceName);
+      const db = dbManager2.getDatabase(resourceName);
       const tables = db.prepare(`SELECT name FROM sqlite_master
 					 WHERE type='table' AND name NOT LIKE 'sqlite_%' AND name NOT LIKE '_litestream_%'
 					 ORDER BY name`).all();
@@ -618,7 +633,7 @@ function createDashboardRoutes(app, dbManager2, config) {
     const limit = parseInt(c.req.query("limit") ?? "50", 10);
     const offset = parseInt(c.req.query("offset") ?? "0", 10);
     try {
-      const db = dbManager2.getD1Database(resourceName);
+      const db = dbManager2.getDatabase(resourceName);
       const columnsResult = db.prepare(`PRAGMA table_info("${tableName}")`).all();
       const columns = columnsResult.map((col) => col.name);
       const countResult = db.prepare(`SELECT COUNT(*) as count FROM "${tableName}"`).get();
@@ -636,7 +651,7 @@ function createDashboardRoutes(app, dbManager2, config) {
       return c.json({ error: `Database binding '${binding}' not found` }, 404);
     }
     try {
-      const db = dbManager2.getD1Database(resourceName);
+      const db = dbManager2.getDatabase(resourceName);
       const tablesResult = db.prepare(`SELECT name FROM sqlite_master
 					 WHERE type='table' AND name NOT LIKE 'sqlite_%'
 					 ORDER BY name`).all();
@@ -789,13 +804,50 @@ function createDashboardRoutes(app, dbManager2, config) {
   app.get("/api/workflow/:binding/executions", (c) => {
     const binding = c.req.param("binding");
     const workflowConfig = config.workflow?.[binding];
-    const limit = parseInt(c.req.query("limit") ?? "20", 10);
+    const limit = Math.min(Math.max(1, parseInt(c.req.query("limit") ?? "20", 10)), 100);
+    const offset = Math.max(0, parseInt(c.req.query("offset") ?? "0", 10));
+    const statusFilter = c.req.query("status")?.toLowerCase() ?? null;
+    const sinceRaw = c.req.query("since") ?? null;
     if (!workflowConfig) {
       return c.json({ error: "Workflow not found" }, 404);
     }
+    const validStatuses = /* @__PURE__ */ new Set([
+      "pending",
+      "running",
+      "completed",
+      "failed",
+      "cancelled"
+    ]);
     try {
       const db = dbManager2.emulatorDb;
-      const workflowName = workflowConfig;
+      const workflowName = getWorkflowName(workflowConfig);
+      let sinceTs = null;
+      if (sinceRaw) {
+        const match = sinceRaw.match(/^(\d+)(s|m|h|d)?$/);
+        if (match) {
+          const val = parseInt(match[1], 10);
+          const unit = match[2] ?? "s";
+          const multipliers = {
+            s: 1,
+            m: 60,
+            h: 3600,
+            d: 86400
+          };
+          sinceTs = Math.floor(Date.now() / 1e3) - val * (multipliers[unit] ?? 1);
+        }
+      }
+      const conditions = ["e.workflow_name = ?"];
+      const queryArgs = [workflowName];
+      if (statusFilter && validStatuses.has(statusFilter)) {
+        conditions.push("e.status = ?");
+        queryArgs.push(statusFilter);
+      }
+      if (sinceTs !== null) {
+        conditions.push("e.created_at >= ?");
+        queryArgs.push(sinceTs);
+      }
+      const where = conditions.join(" AND ");
+      const countRow = db.prepare(`SELECT COUNT(*) as count FROM workflow_executions e WHERE ${where}`).get(...queryArgs);
       const executions = db.prepare(`SELECT
 						e.id,
 						e.workflow_name,
@@ -807,9 +859,9 @@ function createDashboardRoutes(app, dbManager2, config) {
 						(SELECT COUNT(*) FROM workflow_steps WHERE execution_id = e.id) as steps_count,
 						(SELECT COUNT(*) FROM workflow_steps WHERE execution_id = e.id AND status = 'completed') as steps_completed
 					 FROM workflow_executions e
-					 WHERE e.workflow_name = ?
+					 WHERE ${where}
 					 ORDER BY e.created_at DESC
-					 LIMIT ?`).all(workflowName, limit);
+					 LIMIT ? OFFSET ?`).all(...queryArgs, limit, offset);
       return c.json({
         executions: executions.map((e) => ({
           id: e.id,
@@ -821,7 +873,10 @@ function createDashboardRoutes(app, dbManager2, config) {
           stepsCompleted: e.steps_completed,
           errorMessage: e.error,
           createdAt: new Date(e.created_at * 1e3).toISOString()
-        }))
+        })),
+        total: countRow.count,
+        limit,
+        offset
       });
     } catch (err) {
       return c.json({ error: err instanceof Error ? err.message : String(err) }, 500);
@@ -1558,7 +1613,7 @@ function createWorkflowHandlers(db, workerUrl) {
       }
       const now = Math.floor(Date.now() / 1e3);
       if (existing) {
-        db.prepare(`UPDATE workflow_steps SET status = 'running' WHERE execution_id = ? AND step_name = ?`).run(executionId, stepName);
+        db.prepare(`UPDATE workflow_steps SET status = 'running', error = NULL, created_at = ? WHERE execution_id = ? AND step_name = ? AND step_index = ?`).run(now, executionId, stepName, stepIndex);
       } else {
         db.prepare(`INSERT INTO workflow_steps (execution_id, step_name, step_index, status, created_at)
 					 VALUES (?, ?, ?, 'running', ?)`).run(executionId, stepName, stepIndex, now);
@@ -1572,10 +1627,16 @@ function createWorkflowHandlers(db, workerUrl) {
   const stepCompleteHandler = async (c) => {
     try {
       const body = await c.req.json();
-      const { executionId, stepName, output, durationMs } = body;
-      db.prepare(`UPDATE workflow_steps
-				 SET status = 'completed', output = ?, duration_ms = ?
-				 WHERE execution_id = ? AND step_name = ?`).run(JSON.stringify(output), durationMs, executionId, stepName);
+      const { executionId, stepName, stepIndex, output, durationMs } = body;
+      if (stepIndex !== void 0) {
+        db.prepare(`UPDATE workflow_steps
+					 SET status = 'completed', output = ?, duration_ms = ?
+					 WHERE execution_id = ? AND step_name = ? AND step_index = ?`).run(JSON.stringify(output), durationMs, executionId, stepName, stepIndex);
+      } else {
+        db.prepare(`UPDATE workflow_steps
+					 SET status = 'completed', output = ?, duration_ms = ?
+					 WHERE execution_id = ? AND step_name = ?`).run(JSON.stringify(output), durationMs, executionId, stepName);
+      }
       return c.json({ success: true });
     } catch (err) {
       const message = err instanceof Error ? err.message : String(err);
@@ -1585,10 +1646,16 @@ function createWorkflowHandlers(db, workerUrl) {
   const stepFailHandler = async (c) => {
     try {
       const body = await c.req.json();
-      const { executionId, stepName, error: error2, durationMs } = body;
-      db.prepare(`UPDATE workflow_steps
-				 SET status = 'failed', error = ?, duration_ms = ?
-				 WHERE execution_id = ? AND step_name = ?`).run(error2, durationMs, executionId, stepName);
+      const { executionId, stepName, stepIndex, error: error2, durationMs } = body;
+      if (stepIndex !== void 0) {
+        db.prepare(`UPDATE workflow_steps
+					 SET status = 'failed', error = ?, duration_ms = ?
+					 WHERE execution_id = ? AND step_name = ? AND step_index = ?`).run(error2, durationMs, executionId, stepName, stepIndex);
+      } else {
+        db.prepare(`UPDATE workflow_steps
+					 SET status = 'failed', error = ?, duration_ms = ?
+					 WHERE execution_id = ? AND step_name = ?`).run(error2, durationMs, executionId, stepName);
+      }
       return c.json({ success: true });
     } catch (err) {
       const message = err instanceof Error ? err.message : String(err);
@@ -1634,13 +1701,121 @@ function createWorkflowHandlers(db, workerUrl) {
     failHandler
   };
 }
+var DEFAULT_STALL_TIMEOUT_S = 100 * 60;
+function startWorkflowTimeoutEnforcement(db, intervalMs = 5e3, timeouts) {
+  let isRunning = false;
+  return setInterval(() => void (async () => {
+    if (isRunning) {
+      return;
+    }
+    isRunning = true;
+    try {
+      const now = Math.floor(Date.now() / 1e3);
+      const allTimeouts = [
+        timeouts.defaultTimeoutS,
+        ...Object.values(timeouts.perWorkflow)
+      ];
+      const minTimeoutS = Math.min(...allTimeouts);
+      const queryThreshold = now - minTimeoutS;
+      const timedOutCandidates = db.prepare(`SELECT id, workflow_name, started_at FROM workflow_executions
+							 WHERE status = 'running' AND started_at < ?`).all(queryThreshold);
+      for (const execution of timedOutCandidates) {
+        const timeoutS = timeouts.perWorkflow[execution.workflow_name] ?? timeouts.defaultTimeoutS;
+        const threshold = now - timeoutS;
+        if (execution.started_at >= threshold) {
+          continue;
+        }
+        db.prepare(`UPDATE workflow_executions
+							 SET status = 'failed', error = ?, completed_at = ?
+							 WHERE id = ? AND status = 'running'`).run(`Workflow exceeded timeout of ${timeoutS}s`, now, execution.id);
+      }
+      const allStepTimeouts = [
+        timeouts.defaultStepTimeoutS,
+        ...Object.values(timeouts.perWorkflowStep)
+      ];
+      const minStepTimeoutS = Math.min(...allStepTimeouts);
+      const stepQueryThreshold = now - minStepTimeoutS;
+      const timedOutSteps = db.prepare(`SELECT ws.id, ws.execution_id, ws.step_name, ws.step_index, ws.created_at, we.workflow_name
+							 FROM workflow_steps ws
+							 JOIN workflow_executions we ON we.id = ws.execution_id
+							 WHERE ws.status = 'running' AND ws.created_at < ?`).all(stepQueryThreshold);
+      for (const step of timedOutSteps) {
+        const stepTimeoutS = timeouts.perWorkflowStep[step.workflow_name] ?? timeouts.defaultStepTimeoutS;
+        const stepThreshold = now - stepTimeoutS;
+        if (step.created_at >= stepThreshold) {
+          continue;
+        }
+        db.transaction(() => {
+          db.prepare(`UPDATE workflow_steps
+								 SET status = 'failed', error = ?
+								 WHERE id = ? AND status = 'running'`).run(`Step exceeded timeout of ${stepTimeoutS}s`, step.id);
+          db.prepare(`UPDATE workflow_executions
+								 SET status = 'failed', error = ?, completed_at = ?
+								 WHERE id = ? AND status = 'running'`).run(`Step '${step.step_name}' exceeded timeout of ${stepTimeoutS}s`, now, step.execution_id);
+        })();
+      }
+    } catch (err) {
+      warn(`Failed to enforce workflow timeouts: ${err instanceof Error ? err.message : String(err)}`);
+    } finally {
+      isRunning = false;
+    }
+  })(), intervalMs);
+}
+function startStalledWorkflowRecovery(db, workerUrl, intervalMs = 5e3, stallTimeoutS = DEFAULT_STALL_TIMEOUT_S) {
+  let isRunning = false;
+  return setInterval(() => void (async () => {
+    if (isRunning) {
+      return;
+    }
+    isRunning = true;
+    try {
+      const now = Math.floor(Date.now() / 1e3);
+      const queryThreshold = now - stallTimeoutS;
+      const stalledExecutions = db.prepare(`SELECT id, workflow_name, input, started_at FROM workflow_executions
+							 WHERE status = 'running' AND started_at < ?`).all(queryThreshold);
+      for (const execution of stalledExecutions) {
+        let input = null;
+        if (execution.input) {
+          try {
+            input = JSON.parse(execution.input);
+          } catch {
+            db.prepare(`UPDATE workflow_executions SET status = 'failed', error = 'Malformed workflow input payload', completed_at = ? WHERE id = ?`).run(now, execution.id);
+            continue;
+          }
+        }
+        db.prepare(`UPDATE workflow_steps SET status = 'pending', error = NULL
+							 WHERE execution_id = ? AND status = 'running'`).run(execution.id);
+        try {
+          const response = await fetch(workerUrl, {
+            method: "POST",
+            headers: {
+              "Content-Type": "application/json",
+              "X-Ploy-Workflow-Execution": "true",
+              "X-Ploy-Workflow-Name": execution.workflow_name,
+              "X-Ploy-Execution-Id": execution.id
+            },
+            body: JSON.stringify(input)
+          });
+          if (response.ok) {
+            db.prepare(`UPDATE workflow_executions SET started_at = ? WHERE id = ?`).run(Math.floor(Date.now() / 1e3), execution.id);
+          }
+        } catch {
+        }
+      }
+    } catch (err) {
+      warn(`Failed to recover stalled workflows: ${err instanceof Error ? err.message : String(err)}`);
+    } finally {
+      isRunning = false;
+    }
+  })(), intervalMs);
+}
 
 // ../emulator/dist/services/mock-server.js
 var DEFAULT_MOCK_SERVER_PORT = 4003;
 async function startMockServer(dbManager2, config, options = {}) {
   const app = new Hono();
   if (config.db) {
-    const dbHandler = createDbHandler(dbManager2.getD1Database);
+    const dbHandler = createDbHandler(dbManager2.getDatabase);
     app.post("/db", dbHandler);
   }
   if (config.queue) {
@@ -1651,6 +1826,8 @@ async function startMockServer(dbManager2, config, options = {}) {
     app.post("/queue/ack", queueHandlers.ackHandler);
     app.post("/queue/retry", queueHandlers.retryHandler);
   }
+  let stalledRecoveryInterval;
+  let timeoutEnforcementInterval;
   if (config.workflow) {
     const workflowHandlers = createWorkflowHandlers(dbManager2.emulatorDb, options.workerUrl);
     app.post("/workflow/trigger", workflowHandlers.triggerHandler);
@@ -1661,6 +1838,28 @@ async function startMockServer(dbManager2, config, options = {}) {
     app.post("/workflow/step/fail", workflowHandlers.stepFailHandler);
     app.post("/workflow/complete", workflowHandlers.completeHandler);
     app.post("/workflow/fail", workflowHandlers.failHandler);
+    const perWorkflow = {};
+    const perWorkflowStep = {};
+    for (const [, value] of Object.entries(config.workflow)) {
+      const workflowName = getWorkflowName(value);
+      const timeout = getWorkflowTimeout(value);
+      const stepTimeout = getWorkflowStepTimeout(value);
+      if (timeout !== void 0) {
+        perWorkflow[workflowName] = timeout;
+      }
+      if (stepTimeout !== void 0) {
+        perWorkflowStep[workflowName] = stepTimeout;
+      }
+    }
+    timeoutEnforcementInterval = startWorkflowTimeoutEnforcement(dbManager2.emulatorDb, 5e3, {
+      perWorkflow,
+      perWorkflowStep,
+      defaultTimeoutS: DEFAULT_WORKFLOW_TIMEOUT_S,
+      defaultStepTimeoutS: DEFAULT_STEP_TIMEOUT_S
+    });
+    if (options.workerUrl) {
+      stalledRecoveryInterval = startStalledWorkflowRecovery(dbManager2.emulatorDb, options.workerUrl, 5e3, DEFAULT_STALL_TIMEOUT_S);
+    }
   }
   if (config.cache) {
     const cacheHandlers = createCacheHandlers(dbManager2.emulatorDb);
@@ -1708,6 +1907,12 @@ async function startMockServer(dbManager2, config, options = {}) {
       resolve({
         port: info.port,
         close: () => new Promise((res) => {
+          if (stalledRecoveryInterval) {
+            clearInterval(stalledRecoveryInterval);
+          }
+          if (timeoutEnforcementInterval) {
+            clearInterval(timeoutEnforcementInterval);
+          }
           server.close(() => {
             res();
           });
@@ -1943,36 +2148,36 @@ CREATE INDEX IF NOT EXISTS idx_timer_executions_name
 `;
 function initializeDatabases(projectDir) {
   const dataDir = ensureDataDir(projectDir);
-  const d1Databases = /* @__PURE__ */ new Map();
+  const databases = /* @__PURE__ */ new Map();
   const emulatorDb = openDatabase(join(dataDir, "emulator.db"));
   emulatorDb.pragma("journal_mode = WAL");
   emulatorDb.exec(EMULATOR_SCHEMA);
-  function getD1Database(bindingName) {
-    let db = d1Databases.get(bindingName);
+  function getDatabase(bindingName) {
+    let db = databases.get(bindingName);
     if (!db) {
       db = openDatabase(join(dataDir, "db", `${bindingName}.db`));
       db.pragma("journal_mode = WAL");
-      d1Databases.set(bindingName, db);
+      databases.set(bindingName, db);
     }
     return db;
   }
   function close() {
     emulatorDb.close();
-    for (const db of d1Databases.values()) {
+    for (const db of databases.values()) {
       db.close();
     }
-    d1Databases.clear();
+    databases.clear();
   }
   return {
     emulatorDb,
-    getD1Database,
+    getDatabase,
     close
   };
 }
 
 // ../emulator/dist/nextjs-dev.js
 var PLOY_CONTEXT_SYMBOL = /* @__PURE__ */ Symbol.for("__ploy-context__");
-function createDevD1(databaseId, apiUrl) {
+function createDevDB(databaseId, apiUrl) {
   return {
     async dump() {
       const response = await fetch(`${apiUrl}/db`, {
@@ -2139,7 +2344,7 @@ async function initPloyForDev(config) {
     const env2 = {};
     if (hasDbBindings2 && ployConfig2.db) {
       for (const [bindingName, databaseId] of Object.entries(ployConfig2.db)) {
-        env2[bindingName] = createDevD1(databaseId, cliMockServerUrl);
+        env2[bindingName] = createDevDB(databaseId, cliMockServerUrl);
       }
     }
     if (hasAuthConfig2) {
@@ -2191,7 +2396,7 @@ async function initPloyForDev(config) {
   const env = {};
   if (hasDbBindings && ployConfig.db) {
     for (const [bindingName, databaseId] of Object.entries(ployConfig.db)) {
-      env[bindingName] = createDevD1(databaseId, apiUrl);
+      env[bindingName] = createDevDB(databaseId, apiUrl);
     }
   }
   if (hasAuthConfig) {