@deckasoft/waify 0.5.1 → 0.6.1

package/README.md

@@ -60,7 +60,9 @@ All config files live in `~/.config/waify/`:
 
 ## Scheduling
 
-Use `waify schedule add` to create cron jobs. The cron format is **6 fields** (sec min hour dom month dow). Changes require restarting the scheduler:
+Scheduling runs on an [Ofelia](https://github.com/mcuadros/ofelia) `scheduler` container that fires a transient sender container per job tick. `waify setup` generates the `Dockerfile`, builds the `openwa-scripts-sender:latest` image locally, and starts the scheduler — so scheduling works out of the box after setup.
+
+Use `waify schedule add` to create cron jobs. The cron format is **6 fields** (sec min hour dom month dow). Changes restart the scheduler automatically; to restart manually:
 
 ```bash
 waify schedule add morning "0 0 9 * * *"

package/dist/cli/index.js

@@ -12,7 +12,7 @@ var __export = (target, all) => {
 // src/core/paths.ts
 import { join } from "path";
 import { homedir } from "os";
-var dataDir, configPath, promptPath, scheduleJsonPath, schedulePath, logPath, envPath, composePath, qrImagePath;
+var dataDir, configPath, promptPath, scheduleJsonPath, schedulePath, logPath, envPath, composePath, dockerfilePath, qrImagePath;
 var init_paths = __esm({
   "src/core/paths.ts"() {
     "use strict";
@@ -24,6 +24,7 @@ var init_paths = __esm({
     logPath = () => join(dataDir(), "messages.log");
     envPath = () => process.env["WAIFY_ENV_PATH"] ?? join(dataDir(), ".env");
     composePath = () => join(dataDir(), "docker-compose.yml");
+    dockerfilePath = () => join(dataDir(), "Dockerfile");
     qrImagePath = () => join(dataDir(), "qr.png");
   }
 });
@@ -32,7 +33,7 @@ var init_paths = __esm({
 import { existsSync, readFileSync, writeFileSync, mkdirSync } from "fs";
 import { dirname } from "path";
 import { z } from "zod";
-var RecipientSchema, ConfigSchema, defaultConfig, loadConfig, saveConfig, assertConfigReady;
+var RecipientSchema, ConfigSchema, parseConfig, defaultConfig, loadConfig, saveConfig, assertConfigReady;
 var init_config = __esm({
   "src/core/config.ts"() {
     "use strict";
@@ -47,12 +48,16 @@ var init_config = __esm({
       openwaApiKey: z.string().nullable().default(null),
       recipients: z.array(RecipientSchema).max(1).default([])
     });
-    defaultConfig = () => ConfigSchema.parse({});
+    parseConfig = (raw) => {
+      const source = typeof raw === "object" && raw !== null ? raw : {};
+      const override = process.env["OPENWA_BASE_URL"];
+      return ConfigSchema.parse(override ? { ...source, openwaBaseUrl: override } : source);
+    };
+    defaultConfig = () => parseConfig({});
     loadConfig = () => {
       const path = configPath();
       if (!existsSync(path)) return defaultConfig();
-      const raw = readFileSync(path, "utf-8");
-      return ConfigSchema.parse(JSON.parse(raw));
+      return parseConfig(JSON.parse(readFileSync(path, "utf-8")));
     };
     saveConfig = (config) => {
       const path = configPath();
@@ -121,7 +126,7 @@ var init_prompt = __esm({
 import { existsSync as existsSync3, mkdirSync as mkdirSync3, readFileSync as readFileSync3, writeFileSync as writeFileSync3 } from "fs";
 import { dirname as dirname3 } from "path";
 import { z as z3 } from "zod";
-var CRON_RANGES, STEP_RE, RANGE_RE, isValidCronField, isValidCron, 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, renderEnv, renderJob, renderOfeliaIni, regenerateOfeliaIni, addJob, removeJob;
 var init_schedule = __esm({
   "src/core/schedule.ts"() {
     "use strict";
@@ -183,16 +188,24 @@ var init_schedule = __esm({
       image: process.env["WAIFY_SENDER_IMAGE"] ?? "openwa-scripts-sender:latest",
       network: process.env["WAIFY_NETWORK"] ?? "waify-network",
       hostDataDir: process.env["WAIFY_HOST_DATA_DIR"] ?? dataDir(),
-      hostEnvFile: process.env["WAIFY_HOST_ENV_FILE"] ?? envPath()
+      apiBaseUrl: process.env["WAIFY_API_INTERNAL_URL"] ?? "http://openwa-api:2785"
     });
+    renderEnv = (key, value) => `environment = ${key}\\=${value}`;
     renderJob = (job, runtime) => [
       `[job-run "${job.name}"]`,
       `schedule = ${job.schedule}`,
       `image = ${runtime.image}`,
       `network = ${runtime.network}`,
+      // The sender image is built locally, so Ofelia must not try to pull it
+      // (default Pull=true → 404 pull access denied). See mcuadros/ofelia#55.
+      `pull = false`,
       `command = ${job.command}`,
-      `volume = ${runtime.hostDataDir}:/data`,
-      `volume = ${runtime.hostEnvFile}:/app/.env:ro`
+      // WAIFY_DATA_DIR points config/.env resolution at the mounted /data dir;
+      // OPENWA_BASE_URL reaches the API by service name over waify-network
+      // (the mounted config.json says localhost, which is wrong inside a container).
+      renderEnv("WAIFY_DATA_DIR", "/data"),
+      renderEnv("OPENWA_BASE_URL", runtime.apiBaseUrl),
+      `volume = ${runtime.hostDataDir}:/data`
     ].join("\n");
     renderOfeliaIni = (schedule, runtime = ofeliaRuntime()) => {
       const header = [
@@ -334,8 +347,8 @@ var init_sender = __esm({
 });
 
 // src/core/logger.ts
-import { appendFileSync, existsSync as existsSync7, mkdirSync as mkdirSync6, readFileSync as readFileSync5 } from "fs";
-import { dirname as dirname5 } from "path";
+import { appendFileSync, existsSync as existsSync7, mkdirSync as mkdirSync6, readFileSync as readFileSync6 } from "fs";
+import { dirname as dirname6 } from "path";
 var log, LINE_RE, parseLine, readHistory;
 var init_logger = __esm({
   "src/core/logger.ts"() {
@@ -343,7 +356,7 @@ var init_logger = __esm({
     init_paths();
     log = (status, detail) => {
       const path = logPath();
-      mkdirSync6(dirname5(path), { recursive: true });
+      mkdirSync6(dirname6(path), { recursive: true });
       const timestamp = (/* @__PURE__ */ new Date()).toISOString();
       const line = `[${timestamp}] ${status.toUpperCase()} | ${detail}
 `;
@@ -360,7 +373,7 @@ var init_logger = __esm({
     readHistory = (limit) => {
       const path = logPath();
       if (!existsSync7(path)) return [];
-      const lines = readFileSync5(path, "utf-8").split("\n").filter((l) => l.length > 0);
+      const lines = readFileSync6(path, "utf-8").split("\n").filter((l) => l.length > 0);
       const entries = lines.map(parseLine).filter((e) => e !== null);
       return limit ? entries.slice(-limit) : entries;
     };
@@ -985,9 +998,10 @@ var registerInit = (program2) => {
 
 // src/cli/commands/setup.ts
 import { spawnSync } from "child_process";
-import { existsSync as existsSync6, mkdirSync as mkdirSync5, writeFileSync as writeFileSync6 } from "fs";
+import { existsSync as existsSync6, mkdirSync as mkdirSync5, readFileSync as readFileSync5, writeFileSync as writeFileSync6 } from "fs";
 import { homedir as homedir2 } from "os";
-import { join as join2 } from "path";
+import { dirname as dirname5, join as join2 } from "path";
+import { fileURLToPath } from "url";
 import { createInterface } from "readline";
 import qrcode from "qrcode-terminal";
 
@@ -1131,17 +1145,80 @@ var composeTemplate = () => `services:
       - REDIS_BUILTIN=false
     volumes:
       - openwa-data:/app/data
+    networks:
+      - waify-network
+    restart: unless-stopped
+
+  scheduler:
+    image: mcuadros/ofelia:latest
+    depends_on:
+      - openwa-api
+    command: daemon --config=/etc/ofelia/config.ini
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+      - ${schedulePath()}:/etc/ofelia/config.ini:ro
+    networks:
+      - waify-network
     restart: unless-stopped
 
 volumes:
   openwa-data:
+
+networks:
+  waify-network:
+    name: waify-network
 `;
+var waifyVersion = () => {
+  const dir = dirname5(fileURLToPath(import.meta.url));
+  const candidates = [
+    join2(dir, "..", "..", "package.json"),
+    join2(dir, "..", "..", "..", "package.json")
+  ];
+  const found = candidates.find((p) => existsSync6(p));
+  if (!found) return "latest";
+  try {
+    return z5.object({ version: z5.string() }).parse(JSON.parse(readFileSync5(found, "utf-8"))).version;
+  } catch {
+    return "latest";
+  }
+};
+var dockerfileTemplate = (version) => `FROM node:22-alpine
+RUN npm install -g @deckasoft/waify@${version}
+ENTRYPOINT ["waify"]
+`;
+var buildSenderImage = () => {
+  console.warn("Writing Dockerfile and building sender image...");
+  writeFileSync6(dockerfilePath(), dockerfileTemplate(waifyVersion()), "utf-8");
+  const result = spawnSync(
+    "docker",
+    ["build", "-t", "openwa-scripts-sender:latest", "-f", dockerfilePath(), dataDir()],
+    { stdio: "inherit" }
+  );
+  if (result.status !== 0) {
+    console.warn(
+      "warning: sender image build failed \u2014 scheduled sends will not run until it is built."
+    );
+  }
+};
+var startScheduler = () => {
+  console.warn("Starting scheduler...");
+  const result = spawnSync("docker", ["compose", "-f", composePath(), "up", "-d"], {
+    stdio: "inherit"
+  });
+  if (result.status !== 0) {
+    console.warn(
+      `warning: failed to start scheduler \u2014 run manually: docker compose -f ${composePath()} up -d`
+    );
+  }
+};
 var finalizeSetup = (sessionId, jobs) => {
   saveConfig({ ...loadConfig(), openwaSessionId: sessionId });
   if (!existsSync6(promptPath())) {
     savePrompt(defaultPrompt);
   }
   saveSchedule({ jobs });
+  buildSenderImage();
+  startScheduler();
   console.warn("\n\u2713 All done! Run `waify send` to send your first message.");
 };
 var promptLine = (rl, question) => new Promise((resolve) => rl.question(question, resolve));
@@ -1676,6 +1753,19 @@ var registerPrompt = (program2) => {
 
 // src/cli/commands/schedule.ts
 init_schedule();
+init_paths();
+import { spawnSync as spawnSync3 } from "child_process";
+var restartScheduler = () => {
+  console.warn("restarting scheduler\u2026");
+  const result = spawnSync3("docker", ["compose", "-f", composePath(), "restart", "scheduler"], {
+    stdio: "inherit"
+  });
+  if (result.status !== 0) {
+    console.warn(
+      `warning: scheduler restart failed \u2014 run manually: docker compose -f ${composePath()} restart scheduler`
+    );
+  }
+};
 var registerSchedule = (program2) => {
   const schedule = program2.command("schedule").description("Manage Ofelia scheduled jobs");
   schedule.command("list").description("List all scheduled jobs").action(() => {
@@ -1689,14 +1779,16 @@ var registerSchedule = (program2) => {
 `);
     });
   });
-  schedule.command("add <name> <cron>").description('Add a new job. <cron> uses 6-field syntax (sec min hour dom month dow), e.g. "0 0 9 * * *"').option("-c, --command <cmd>", "command for the sender container to run", "send").action((name, cron, { command }) => {
+  schedule.command("add <name> <cron>").description('Add a new job. <cron> uses 6-field syntax (sec min hour dom month dow), e.g. "0 0 9 * * *"').option("-c, --command <cmd>", "command for the sender container to run", "send").option("--no-restart", "skip automatic scheduler restart").action((name, cron, { command, restart }) => {
     const job = ScheduledJobSchema.parse({ name, schedule: cron, command });
     addJob(job);
-    console.warn(`added job "${name}" \u2014 restart scheduler: docker compose restart scheduler`);
+    console.warn(`added job "${name}"`);
+    if (restart) restartScheduler();
   });
-  schedule.command("remove <name>").description("Remove a job by name").action((name) => {
+  schedule.command("remove <name>").description("Remove a job by name").option("--no-restart", "skip automatic scheduler restart").action((name, { restart }) => {
     removeJob(name);
-    console.warn(`removed job "${name}" \u2014 restart scheduler: docker compose restart scheduler`);
+    console.warn(`removed job "${name}"`);
+    if (restart) restartScheduler();
   });
 };
 

package/package.json

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