levix-bot 2.1.1 → 2.2.0

package/src/db/store.cjs

@@ -623,7 +623,7 @@ function countDebts(settled = false) {
 // them, and a crash in the middle of a write can't truncate the file.
 //
 // A job is `{ id, type, targetJid, message, cronString?, date?, status,
-// creatorJid }` — the shape !schedule and !autoschedule have always built.
+// creatorJid, lastRunAt?, lastDeliveryStatus?, lastError? }`.
 
 function scheduleRow(row) {
   if (!row) return null;
@@ -637,6 +637,9 @@ function scheduleRow(row) {
     status: row.status,
     creatorJid: row.creator_jid ?? null,
     createdAt: row.created_at,
+    lastRunAt: row.last_run_at ?? null,
+    lastDeliveryStatus: row.last_delivery_status ?? null,
+    lastError: row.last_error ?? null,
   };
 }
 
@@ -651,8 +654,9 @@ function getSchedule(id) {
 function saveSchedule(job) {
   q(
     `INSERT INTO schedules
-       (id, type, target_jid, message, cron_string, date, status, creator_jid, created_at)
-     VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
+       (id, type, target_jid, message, cron_string, date, status, creator_jid,
+        created_at, last_run_at, last_delivery_status, last_error)
+     VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
      ON CONFLICT(id) DO UPDATE SET
        type        = excluded.type,
        target_jid  = excluded.target_jid,
@@ -660,7 +664,10 @@ function saveSchedule(job) {
        cron_string = excluded.cron_string,
        date        = excluded.date,
        status      = excluded.status,
-       creator_jid = excluded.creator_jid`
+       creator_jid = excluded.creator_jid,
+       last_run_at = excluded.last_run_at,
+       last_delivery_status = excluded.last_delivery_status,
+       last_error = excluded.last_error`
   ).run(
     String(job.id),
     job.type,
@@ -670,7 +677,10 @@ function saveSchedule(job) {
     job.date ?? null,
     job.status || "pending",
     job.creatorJid ?? null,
-    job.createdAt ?? Date.now()
+    job.createdAt ?? Date.now(),
+    job.lastRunAt ?? null,
+    job.lastDeliveryStatus ?? null,
+    job.lastError ?? null
   );
   return getSchedule(job.id);
 }
@@ -679,6 +689,15 @@ function setScheduleStatus(id, status) {
   q("UPDATE schedules SET status = ? WHERE id = ?").run(status, String(id));
 }
 
+function setScheduleDelivery(id, status, runAt, error = null) {
+  q(
+    `UPDATE schedules
+        SET last_delivery_status = ?, last_run_at = ?, last_error = ?
+      WHERE id = ?`
+  ).run(status, runAt, error, String(id));
+  return getSchedule(id);
+}
+
 function deleteSchedule(id) {
   const { changes } = q("DELETE FROM schedules WHERE id = ?").run(String(id));
   return changes > 0;
@@ -821,6 +840,7 @@ module.exports = {
   getSchedule,
   saveSchedule,
   setScheduleStatus,
+  setScheduleDelivery,
   deleteSchedule,
   countSchedules,
   // AI history

package/src/routes/dashboard.api.esm.js

@@ -49,7 +49,8 @@ const memory = require("../utils/memory.cjs");
 const secrets = require("../config/secrets.cjs");
 const { DATA_DIR } = require("../config/paths.cjs");
 const { PERSONA_FILE } = require("../services/aiAgent.cjs");
-const { deleteScheduledJob } = require("../../scheduler.cjs");
+const { deleteScheduledJob, retryScheduledJob } = require("../../scheduler.cjs");
+const { describeScheduledJob } = require("../utils/recurrence.cjs");
 
 const router = Router();
 
@@ -732,9 +733,23 @@ router.post("/roles", (req, res) => {
 // Scheduled messages
 // ===========================================================================
 
+function scheduleView(job) {
+  if (!job) return null;
+  const timezone = settings.get("bot_timezone");
+  return { ...job, when: describeScheduledJob(job, timezone) };
+}
+
+function scheduleViews() {
+  return getSchedules().map(scheduleView);
+}
+
 router.get("/schedules", (req, res) => {
   try {
-    res.json({ success: true, schedules: getSchedules() });
+    res.json({
+      success: true,
+      timezone: settings.get("bot_timezone"),
+      schedules: scheduleViews(),
+    });
   } catch (error) {
     fail(res, error, "Error listing schedules");
   }
@@ -745,12 +760,54 @@ router.delete("/schedules/:id", (req, res) => {
     // Through the scheduler, not the store: the running timer/cron task has to
     // be stopped too, or a deleted job still fires until the next restart.
     deleteScheduledJob(req.params.id);
-    res.json({ success: true, schedules: getSchedules() });
+    res.json({ success: true, schedules: scheduleViews() });
   } catch (error) {
     fail(res, error, "Error deleting a schedule");
   }
 });
 
+router.post(
+  "/schedules/:id/retry",
+  asyncRoute(async (req, res) => {
+    const id = String(req.params.id ?? "");
+    if (!id || id.length > 128) return badRequest(res, "Invalid schedule ID");
+
+    const sock = currentSocket();
+    if (!sessionState().connected || !sock) {
+      return res.status(409).json({
+        success: false,
+        error: "Connect WhatsApp before retrying a schedule",
+      });
+    }
+
+    const result = await retryScheduledJob(sock, id);
+    if (result.reason === "not_found") {
+      return res.status(404).json({ success: false, error: "Schedule not found" });
+    }
+    if (result.reason === "not_failed") {
+      return res.status(409).json({
+        success: false,
+        error: "Only a failed delivery can be retried",
+      });
+    }
+    if (result.reason === "in_flight") {
+      return res.status(409).json({
+        success: false,
+        error: "This schedule is already being delivered",
+      });
+    }
+    if (!result.ok) {
+      return res.status(502).json({
+        success: false,
+        error: "WhatsApp delivery failed; the schedule remains retryable",
+        schedule: scheduleView(result.job),
+      });
+    }
+
+    res.json({ success: true, schedule: scheduleView(result.job) });
+  })
+);
+
 // ===========================================================================
 // Security — the panel's own password
 // ===========================================================================

package/src/utils/recurrence.cjs

@@ -0,0 +1,161 @@
+const DAY_ALIASES = new Map([
+  ["0", 0],
+  ["7", 0],
+  ["sun", 0],
+  ["sunday", 0],
+  ["الاحد", 0],
+  ["احد", 0],
+  ["1", 1],
+  ["mon", 1],
+  ["monday", 1],
+  ["الاثنين", 1],
+  ["اثنين", 1],
+  ["الاتنين", 1],
+  ["اتنين", 1],
+  ["2", 2],
+  ["tue", 2],
+  ["tues", 2],
+  ["tuesday", 2],
+  ["الثلاثاء", 2],
+  ["ثلاثاء", 2],
+  ["التلات", 2],
+  ["3", 3],
+  ["wed", 3],
+  ["wednesday", 3],
+  ["الاربعاء", 3],
+  ["اربعاء", 3],
+  ["الاربع", 3],
+  ["4", 4],
+  ["thu", 4],
+  ["thur", 4],
+  ["thurs", 4],
+  ["thursday", 4],
+  ["الخميس", 4],
+  ["خميس", 4],
+  ["5", 5],
+  ["fri", 5],
+  ["friday", 5],
+  ["الجمعه", 5],
+  ["جمعه", 5],
+  ["6", 6],
+  ["sat", 6],
+  ["saturday", 6],
+  ["السبت", 6],
+  ["سبت", 6],
+]);
+
+const WEEKDAYS = [
+  "Sunday",
+  "Monday",
+  "Tuesday",
+  "Wednesday",
+  "Thursday",
+  "Friday",
+  "Saturday",
+];
+
+function normalizeDay(value) {
+  return String(value ?? "")
+    .trim()
+    .toLowerCase()
+    .normalize("NFKC")
+    .replace(/[\u0640\u064b-\u065f\u0670]/g, "")
+    .replace(/[أإآ]/g, "ا")
+    .replace(/ة/g, "ه");
+}
+
+function parseDayOfWeek(value) {
+  return DAY_ALIASES.get(normalizeDay(value)) ?? null;
+}
+
+function parseTime(value) {
+  const match = /^(\d{1,2}):(\d{2})$/.exec(String(value ?? "").trim());
+  if (!match) return null;
+
+  const hour = Number(match[1]);
+  const minute = Number(match[2]);
+  if (hour > 23 || minute > 59) return null;
+
+  return {
+    hour,
+    minute,
+    text: `${String(hour).padStart(2, "0")}:${String(minute).padStart(2, "0")}`,
+  };
+}
+
+function parseRecurringArgs(args) {
+  const type = String(args[0] ?? "").trim().toLowerCase();
+
+  if (type === "daily") {
+    const time = parseTime(args[1]);
+    const message = args.slice(2).join(" ").trim();
+    if (!time) return { error: "time" };
+    if (!message) return { error: "message" };
+    return {
+      type,
+      time: time.text,
+      message,
+      cronString: `${time.minute} ${time.hour} * * *`,
+    };
+  }
+
+  if (type === "weekly") {
+    const dayOfWeek = parseDayOfWeek(args[1]);
+    const time = parseTime(args[2]);
+    const message = args.slice(3).join(" ").trim();
+    if (dayOfWeek === null) return { error: "day" };
+    if (!time) return { error: "time" };
+    if (!message) return { error: "message" };
+    return {
+      type,
+      dayOfWeek,
+      time: time.text,
+      message,
+      cronString: `${time.minute} ${time.hour} * * ${dayOfWeek}`,
+    };
+  }
+
+  return { error: type ? "type" : "usage" };
+}
+
+function describeScheduledJob(job, timezone) {
+  if (job.type === "recurring") {
+    const parts = String(job.cronString ?? "").trim().split(/\s+/);
+    if (parts.length === 5) {
+      const [minuteText, hourText, dayOfMonth, month, dayText] = parts;
+      const minute = Number(minuteText);
+      const hour = Number(hourText);
+      const validTime =
+        /^\d+$/.test(minuteText) &&
+        /^\d+$/.test(hourText) &&
+        minute >= 0 &&
+        minute <= 59 &&
+        hour >= 0 &&
+        hour <= 23;
+
+      if (validTime && dayOfMonth === "*" && month === "*") {
+        const time = `${String(hour).padStart(2, "0")}:${String(minute).padStart(2, "0")}`;
+        if (dayText === "*") return `Daily at ${time} (${timezone})`;
+
+        const day = parseDayOfWeek(dayText);
+        if (day !== null) return `Every ${WEEKDAYS[day]} at ${time} (${timezone})`;
+      }
+    }
+
+    return `${job.cronString || "Unknown recurrence"} (${timezone})`;
+  }
+
+  const date = new Date(job.date);
+  if (!Number.isFinite(date.getTime())) return "Invalid date";
+  return `${new Intl.DateTimeFormat("en-GB", {
+    dateStyle: "medium",
+    timeStyle: "short",
+    timeZone: timezone,
+  }).format(date)} (${timezone})`;
+}
+
+module.exports = {
+  parseDayOfWeek,
+  parseRecurringArgs,
+  describeScheduledJob,
+};

package/src/utils/storage.cjs

@@ -75,6 +75,7 @@ module.exports = {
   getSchedule: store.getSchedule,
   saveSchedule: store.saveSchedule,
   setScheduleStatus: store.setScheduleStatus,
+  setScheduleDelivery: store.setScheduleDelivery,
   deleteSchedule: store.deleteSchedule,
   countSchedules: store.countSchedules,
 };

package/src/utils/storage.esm.js

@@ -89,5 +89,6 @@ export const getSchedules = store.getSchedules;
 export const getSchedule = store.getSchedule;
 export const saveSchedule = store.saveSchedule;
 export const setScheduleStatus = store.setScheduleStatus;
+export const setScheduleDelivery = store.setScheduleDelivery;
 export const deleteSchedule = store.deleteSchedule;
 export const countSchedules = store.countSchedules;