@goodandready/dsh-cron 0.2.49 → 0.2.51

package/lib/api.js

@@ -1,3 +1,4 @@
+import { sanitizeValidators } from './validators.js';
 /**
  * REST surface of the plugin: the /dsh-cron/tasks and /dsh-cron/action route
  * families. Extracted from index.js and split into per-scope handlers so each
@@ -7,7 +8,7 @@
 
 import { randomUUID, createHash } from 'node:crypto';
 import { parseScheduleExpression } from './scheduler.js';
-import { normalizeTaskType, CODE_EXECUTING_TYPES } from './runtimes.js';
+import { normalizeTaskType, CODE_EXECUTING_TYPES, EXTERNAL_RUNTIMES } from './runtimes.js';
 import { CHANNEL_IDS, unknownChannelIds } from './channels.js';
 import { applyTaskPatch } from './task-patch.js';
 import { MANAGED_BY_CONFIG, configOwnedMessage } from './config-jobs.js';
@@ -265,7 +266,8 @@ function buildTaskRecord(store, body, taskType, parsed) {
     misfirePolicy: ['skip', 'runOnce', 'catchUpAll'].includes(body.misfirePolicy) ? body.misfirePolicy : (current ? (current.misfirePolicy || 'skip') : 'skip'),
     maxRetries: body.maxRetries !== undefined ? Math.max(0, Number(body.maxRetries) || 0) : (current ? (Number(current.maxRetries) || 0) : 0),
     retryBackoffMs: body.retryBackoffMs !== undefined ? Math.max(1000, Number(body.retryBackoffMs) || 30000) : (current ? (Number(current.retryBackoffMs) || 30000) : 30000),
-    permissionPreset: ['default', 'read-only', 'workspace-write', 'full'].includes(body.permissionPreset) ? body.permissionPreset : (current ? (current.permissionPreset || 'default') : 'default'),
+    permissionPreset: !EXTERNAL_RUNTIMES.includes(taskType) && ['default', 'read-only', 'workspace-write', 'full'].includes(body.permissionPreset) ? body.permissionPreset : (current && !EXTERNAL_RUNTIMES.includes(taskType) ? (current.permissionPreset || 'default') : 'default'),
+    validators: Array.isArray(body.validators) ? sanitizeValidators(body.validators) : (current ? current.validators : undefined),
     ...mergeExecutionFields(current, body, parsed),
   };
 }
@@ -341,6 +343,34 @@ async function handleTaskItem({ store, scheduler, req, res, url, id, action, api
 
 /** Task actions that are plain POSTs. Returns true when one matched. */
 async function handleItemPost({ store, scheduler, req, res, url, id, action }) {
+  if (action === 'retry-delivery') {
+    const task = store.get(id);
+    if (!task) {
+      sendJson(res, 404, NOT_FOUND);
+      return true;
+    }
+    const body = await readBodyJson(req).catch(() => ({}));
+    const runId = body.runId || url.searchParams.get('runId');
+    const runs = store.history.get(id) || [];
+    const run = runId ? runs.find(r => r.id === runId) : runs[0];
+    if (!run) {
+      sendJson(res, 404, { ok: false, error: 'Run not found' });
+      return true;
+    }
+    const delivery = await scheduler.deliverNotifications(task, run);
+    run.delivery = delivery;
+    if (Array.isArray(run.stages)) {
+      const deliveryStage = run.stages.find(s => s.name === 'delivery');
+      if (deliveryStage) {
+        deliveryStage.status = delivery?.status || 'delivered';
+        deliveryStage.delivered = delivery?.delivered;
+        deliveryStage.failures = delivery?.failures;
+      }
+    }
+    store.scheduleSave();
+    sendJson(res, 200, { ok: true, delivery, run });
+    return true;
+  }
   if (action === 'run') {
     if (!store.get(id)) {
       sendJson(res, 404, NOT_FOUND);

package/lib/channels.js

@@ -15,7 +15,7 @@ export const CHANNEL_IDS = ['telegram', 'kanban', 'discord', 'slack', 'ntfy', 'b
 
 // CHANNEL_LABELS removed (#155) — localized via lib/client.js
 
-export const isFailureStatus = (status) => status === 'error' || status === 'timeout' || status === 'missed';
+export const isFailureStatus = (status) => status === 'error' || status === 'timeout' || status === 'missed' || status === 'validation_failed' || status === 'validator_error';
 export const isFailed = (status) => isFailureStatus(status);
 
 /** The message text for a channel: task template -> channel template -> global template -> built-in defaults (#233). */
@@ -362,7 +362,9 @@ const CHANNEL_HANDLERS = {
   },
 
   async tts({ task, runInfo, settings, http, signal, timeoutMs }) {
-    const base = String(settings.ttsBaseUrl || 'http://127.0.0.1:3080').replace(/\/+$/, '');
+    const defaultPort = settings._webServerPort || settings.webServerPort || (settings.webServer && settings.webServer.port) || 3080;
+    const rawBase = String(settings.ttsBaseUrl || '').trim();
+    const base = (rawBase ? rawBase : `http://127.0.0.1:${defaultPort}`).replace(/\/+$/, '');
     const payload = { text: truncateText(messageTextFor('tts', task, runInfo, settings), 600) };
     const data = await postJson(http, `${base}/dsh-tts/speak`, { 'Content-Type': 'application/json' }, JSON.stringify(payload), 'tts', signal, timeoutMs);
     return { provider: data.provider || 'dsh-tts', tookMs: data.tookMs || null };