@deckasoft/waify 0.4.3 → 0.5.0

package/dist/cli/index.js

@@ -119,16 +119,42 @@ var init_prompt = __esm({
 
 // src/core/schedule.ts
 import { existsSync as existsSync3, mkdirSync as mkdirSync3, readFileSync as readFileSync3, writeFileSync as writeFileSync3 } from "fs";
-import { dirname as dirname3, resolve } from "path";
+import { dirname as dirname3 } from "path";
 import { z as z3 } from "zod";
-var ScheduledJobSchema, ScheduleSchema, defaultSchedule, scheduleJsonPath2, loadSchedule, saveSchedule, ofeliaRuntime, renderJob, renderOfeliaIni, regenerateOfeliaIni, addJob, removeJob;
+var CRON_RANGES, STEP_RE, RANGE_RE, isValidCronField, isValidCron, ScheduledJobSchema, ScheduleSchema, defaultSchedule, scheduleJsonPath2, loadSchedule, saveSchedule, ofeliaRuntime, renderJob, renderOfeliaIni, regenerateOfeliaIni, addJob, removeJob;
 var init_schedule = __esm({
   "src/core/schedule.ts"() {
     "use strict";
     init_paths();
+    CRON_RANGES = [
+      [0, 59],
+      // seconds
+      [0, 59],
+      // minutes
+      [0, 23],
+      // hours
+      [1, 31],
+      // day-of-month
+      [1, 12],
+      // month
+      [0, 7]
+      // day-of-week
+    ];
+    STEP_RE = /^(\*|\d+)\/\d+$/;
+    RANGE_RE = /^\d+-\d+$/;
+    isValidCronField = (field, [min, max]) => {
+      if (field === "*") return true;
+      if (STEP_RE.test(field) || RANGE_RE.test(field)) return true;
+      const n = Number(field);
+      return Number.isInteger(n) && n >= min && n <= max;
+    };
+    isValidCron = (value) => {
+      const fields = value.trim().split(/\s+/);
+      return fields.length === 6 && fields.every((f, i) => isValidCronField(f, CRON_RANGES[i]));
+    };
     ScheduledJobSchema = z3.object({
       name: z3.string().min(1).regex(/^[a-z0-9-]+$/, "name must be lowercase alphanumeric with dashes"),
-      schedule: z3.string().min(1),
+      schedule: z3.string().min(1).refine(isValidCron, { message: "schedule must be a 6-field cron expression (e.g. 0 0 9 * * *)" }),
       command: z3.string().min(1).default("send")
     });
     ScheduleSchema = z3.object({
@@ -156,8 +182,8 @@ var init_schedule = __esm({
     ofeliaRuntime = () => ({
       image: process.env["WAIFY_SENDER_IMAGE"] ?? "openwa-scripts-sender:latest",
       network: process.env["WAIFY_NETWORK"] ?? "waify-network",
-      hostDataDir: process.env["WAIFY_HOST_DATA_DIR"] ?? resolve(process.cwd(), "data"),
-      hostEnvFile: process.env["WAIFY_HOST_ENV_FILE"] ?? resolve(process.cwd(), ".env")
+      hostDataDir: process.env["WAIFY_HOST_DATA_DIR"] ?? dataDir(),
+      hostEnvFile: process.env["WAIFY_HOST_ENV_FILE"] ?? envPath()
     });
     renderJob = (job, runtime) => [
       `[job-run "${job.name}"]`,
@@ -887,8 +913,12 @@ var init_start = __esm({
   }
 });
 
+// src/cli/env.ts
+init_paths();
+import { config as dotenvConfig } from "dotenv";
+dotenvConfig({ path: envPath() });
+
 // src/cli/index.ts
-import "dotenv/config";
 import { Command } from "commander";
 
 // src/cli/commands/init.ts
@@ -1050,7 +1080,7 @@ var createSpinner = (message) => {
     }
   };
 };
-var wait = (ms) => new Promise((resolve2) => setTimeout(resolve2, ms));
+var wait = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 var fetchWithTimeout = (url, opts = {}, timeoutMs = 5e3) => fetch(url, { ...opts, signal: AbortSignal.timeout(timeoutMs) });
 var renderQrInTerminal = (dataUrl) => {
   const raw = decodeQrDataUrl(dataUrl);
@@ -1106,17 +1136,45 @@ var composeTemplate = () => `services:
 volumes:
   openwa-data:
 `;
-var finalizeSetup = (sessionId) => {
+var finalizeSetup = (sessionId, jobs) => {
   saveConfig({ ...loadConfig(), openwaSessionId: sessionId });
   if (!existsSync6(promptPath())) {
     savePrompt(defaultPrompt);
   }
-  if (!existsSync6(scheduleJsonPath())) {
-    saveSchedule(defaultSchedule);
-  }
+  saveSchedule({ jobs });
   console.warn("\n\u2713 All done! Run `waify send` to send your first message.");
 };
-var promptLine = (rl, question) => new Promise((resolve2) => rl.question(question, resolve2));
+var promptLine = (rl, question) => new Promise((resolve) => rl.question(question, resolve));
+var promptUntilValid = async (promptFn, question, validate, errorMsg) => {
+  const answer = (await promptFn(question)).trim();
+  if (validate(answer)) return answer;
+  process.stderr.write(errorMsg + "\n");
+  return promptUntilValid(promptFn, question, validate, errorMsg);
+};
+var collectJobs = async (promptFn, accumulated = []) => {
+  const name = await promptUntilValid(
+    promptFn,
+    "Job name: ",
+    (v) => /^[a-z0-9-]+$/.test(v),
+    "Name must be lowercase letters, numbers, and dashes only."
+  );
+  const schedule = await promptUntilValid(
+    promptFn,
+    "Cron pattern (e.g. 0 0 9 * * *): ",
+    isValidCron,
+    "Invalid cron pattern. Use 6 space-separated fields, e.g. 0 0 9 * * *"
+  );
+  const job = ScheduledJobSchema.parse({ name, schedule, command: "send" });
+  const jobs = [...accumulated, job];
+  const more = (await promptFn("Add another schedule? (y/N) ")).trim().toLowerCase();
+  return more === "y" ? collectJobs(promptFn, jobs) : jobs;
+};
+var promptScheduleJobs = async (promptFn) => {
+  process.stderr.write(
+    "\nConfigure your message schedule (at least one job required).\nJob names: lowercase letters, numbers, and dashes only.\nCron pattern: 6 fields, e.g. 0 0 9 * * *  (sec min hour dom month dow)\n\n"
+  );
+  return collectJobs(promptFn);
+};
 var registerSetup = (program2) => {
   program2.command("setup").description(
     "Guided first-run wizard: installs OpenWA, authenticates WhatsApp, and configures waify"
@@ -1164,6 +1222,7 @@ var registerSetup = (program2) => {
       const chatId = `${recipientNumber.trim()}@c.us`;
       saveSecrets({ GEMINI_API_KEY: geminiKey.trim(), OPENWA_API_KEY: "" });
       saveConfig({ ...loadConfig(), recipients: [{ chatId }] });
+      const jobs = await promptScheduleJobs((q) => promptLine(rl, q));
       console.warn("Writing docker-compose.yml...");
       writeFileSync6(composePath(), composeTemplate(), "utf-8");
       console.warn(
@@ -1300,18 +1359,28 @@ var registerSetup = (program2) => {
         { encoding: "utf-8" }
       );
       console.warn("Starting WhatsApp engine...");
-      const startRes = await fetchWithTimeout(
-        `${baseUrl}/api/sessions/${sessionId}/start`,
-        {
-          method: "POST",
-          headers: { "X-API-Key": openwaApiKey }
-        },
-        1e4
-      );
-      if (!startRes.ok && startRes.status !== 400) {
-        throw new Error(
-          `Failed to start session: ${startRes.status} ${startRes.statusText}`
+      try {
+        const startRes = await fetchWithTimeout(
+          `${baseUrl}/api/sessions/${sessionId}/start`,
+          {
+            method: "POST",
+            headers: { "X-API-Key": openwaApiKey }
+          },
+          6e4
         );
+        if (!startRes.ok && startRes.status !== 400) {
+          throw new Error(
+            `Failed to start session: ${startRes.status} ${startRes.statusText}`
+          );
+        }
+      } catch (err) {
+        if (err instanceof Error && (err.name === "TimeoutError" || err.name === "AbortError")) {
+          console.warn(
+            "   (Engine start is taking longer than expected \u2014 Chromium may still be loading, continuing\u2026)"
+          );
+        } else {
+          throw err;
+        }
       }
       try {
         const preStatusRes = await fetchWithTimeout(
@@ -1324,7 +1393,7 @@ var registerSetup = (program2) => {
           );
           if (preStatus.success && preStatus.data.status === "ready") {
             console.warn("\u2713 WhatsApp already linked \u2014 skipping QR scan");
-            finalizeSetup(sessionId);
+            finalizeSetup(sessionId, jobs);
             return;
           }
         }
@@ -1401,7 +1470,7 @@ var registerSetup = (program2) => {
         return;
       }
       connectSpinner.succeed("WhatsApp connected!");
-      finalizeSetup(sessionId);
+      finalizeSetup(sessionId, jobs);
     } catch (err) {
       console.error(err instanceof Error ? err.message : String(err));
       process.exitCode = 1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deckasoft/waify",
-  "version": "0.4.3",
+  "version": "0.5.0",
   "description": "AI-powered daily message sender for WhatsApp, powered by OpenWA",
   "keywords": [
     "whatsapp",