@deckasoft/waify 0.3.4 → 0.3.5

package/dist/cli/index.js

@@ -963,40 +963,46 @@ import { existsSync as existsSync6, mkdirSync as mkdirSync4, writeFileSync as wr
 import { homedir as homedir2 } from "os";
 import { join as join2 } from "path";
 import { createInterface } from "readline";
-import * as crypto from "crypto";
 import { z as z5 } from "zod";
-import qrcode from "qrcode-terminal";
 var SessionResponseSchema = z5.object({
   id: z5.string().optional(),
   name: z5.string().optional()
 });
 var QrResponseSchema = z5.object({
-  qr: z5.string().optional()
+  qrCode: z5.string().optional()
 });
 var StatusResponseSchema = z5.object({
-  status: z5.string().optional(),
-  connected: z5.boolean().optional()
+  status: z5.string().optional()
 });
 var wait = (ms) => new Promise((resolve2) => setTimeout(resolve2, ms));
-var composeTemplate = (openwaApiKey) => `services:
+var fetchWithTimeout = (url, opts = {}, timeoutMs = 5e3) => fetch(url, { ...opts, signal: AbortSignal.timeout(timeoutMs) });
+var composeTemplate = () => `services:
   openwa-api:
     image: ghcr.io/deckasoft/openwa:latest
     ports:
-      - '2785:3000'
+      - '2785:2785'
     environment:
       - NODE_ENV=production
-      - OPENWA_API_KEY=${openwaApiKey}
+      - PORT=2785
+      - DATABASE_TYPE=sqlite
+      - DATABASE_SYNCHRONIZE=true
+      - ENGINE_TYPE=whatsapp-web.js
+      - SESSION_DATA_PATH=/app/data/sessions
+      - PUPPETEER_HEADLESS=true
+      - PUPPETEER_ARGS=--no-sandbox,--disable-setuid-sandbox,--disable-dev-shm-usage,--disable-gpu
+      - STORAGE_TYPE=local
+      - STORAGE_LOCAL_PATH=/app/data/media
+      - QUEUE_ENABLED=false
+      - REDIS_ENABLED=false
+      - REDIS_BUILTIN=false
     volumes:
       - openwa-data:/app/data
     restart: unless-stopped
 
   openwa-dashboard:
-    image: ghcr.io/deckasoft/openwa:latest
+    image: ghcr.io/deckasoft/openwa-dashboard:latest
     ports:
-      - '2886:4000'
-    environment:
-      - NODE_ENV=production
-      - OPENWA_API_KEY=${openwaApiKey}
+      - '2886:80'
     restart: unless-stopped
 
 volumes:
@@ -1005,131 +1011,167 @@ volumes:
 var promptLine = (rl, question) => new Promise((resolve2) => rl.question(question, resolve2));
 var registerSetup = (program2) => {
   program2.command("setup").description("Guided first-run wizard: installs OpenWA, authenticates WhatsApp, and configures waify").action(async () => {
-    console.warn("Checking Docker...");
-    const dockerCheck = spawnSync("docker", ["info"], { stdio: "pipe" });
-    if (dockerCheck.status !== 0) {
-      console.error("Docker is not running or not installed. Please install Docker and start it before running setup.");
-      process.exit(1);
-    }
-    console.warn("Creating config directory...");
-    mkdirSync4(join2(homedir2(), ".config", "waify"), { recursive: true });
-    console.warn("Generating credentials...");
-    const openwaApiKey = crypto.randomUUID();
-    console.warn("Writing docker-compose.yml...");
-    writeFileSync5(composePath(), composeTemplate(openwaApiKey), "utf-8");
-    console.warn("Starting OpenWA containers (this may take a minute on first run)...");
-    const upResult = spawnSync("docker", ["compose", "-f", composePath(), "up", "-d"], {
-      stdio: "inherit"
-    });
-    if (upResult.status !== 0) {
-      console.error("Failed to start OpenWA containers. Check docker compose logs for details.");
-      process.exit(1);
-    }
-    console.warn("Waiting for OpenWA API to start...");
-    let apiReady = false;
-    for (let attempt = 0; attempt < 30; attempt++) {
-      try {
-        const res = await fetch("http://localhost:2785/api");
-        if (res.status >= 200 && res.status < 300) {
-          apiReady = true;
-          break;
+    try {
+      console.warn("Checking Docker...");
+      const dockerCheck = spawnSync("docker", ["info"], { stdio: "pipe" });
+      if (dockerCheck.status !== 0) {
+        console.error("Docker is not running or not installed. Please install Docker and start it before running setup.");
+        process.exit(1);
+      }
+      console.warn("Creating config directory...");
+      mkdirSync4(join2(homedir2(), ".config", "waify"), { recursive: true });
+      console.warn("Writing docker-compose.yml...");
+      writeFileSync5(composePath(), composeTemplate(), "utf-8");
+      console.warn("Starting OpenWA containers (this may take a minute on first run)...");
+      const upResult = spawnSync("docker", ["compose", "-f", composePath(), "up", "-d", "--no-deps", "openwa-api"], {
+        stdio: "inherit"
+      });
+      if (upResult.status !== 0) {
+        console.error("Failed to start OpenWA containers. Check docker compose logs for details.");
+        process.exit(1);
+      }
+      console.warn("Waiting for OpenWA API to start...");
+      let apiReady = false;
+      for (let attempt = 0; attempt < 30; attempt++) {
+        try {
+          const res = await fetchWithTimeout("http://localhost:2785/api/health");
+          if (res.status >= 200 && res.status < 300) {
+            apiReady = true;
+            break;
+          }
+        } catch {
         }
-      } catch {
+        await wait(2e3);
       }
-      await wait(2e3);
-    }
-    if (!apiReady) {
-      console.error(
-        "OpenWA API did not become ready in time. Check logs with: docker compose -f " + composePath() + " logs openwa-api"
+      if (!apiReady) {
+        console.error(
+          "OpenWA API did not become ready in time. Check logs with: docker compose -f " + composePath() + " logs openwa-api"
+        );
+        process.exit(1);
+      }
+      console.warn("Reading API credentials...");
+      const keyResult = spawnSync(
+        "docker",
+        ["compose", "-f", composePath(), "exec", "-T", "openwa-api", "cat", "/app/data/.api-key"],
+        { encoding: "utf-8", stdio: "pipe" }
       );
-      process.exit(1);
-    }
-    console.warn("Creating WhatsApp session...");
-    const sessionRes = await fetch("http://localhost:2785/api/sessions", {
-      method: "POST",
-      headers: {
-        "X-API-Key": openwaApiKey,
-        "Content-Type": "application/json"
-      },
-      body: JSON.stringify({ name: "waify" })
-    });
-    if (!sessionRes.ok) {
-      throw new Error(`Failed to create session: ${sessionRes.status} ${sessionRes.statusText}`);
-    }
-    const sessionData = SessionResponseSchema.parse(await sessionRes.json());
-    const sessionId = sessionData.id ?? sessionData.name ?? "waify";
-    saveConfig({ ...loadConfig(), openwaApiKey, openwaSessionId: sessionId });
-    console.warn("\u{1F4F1} Scan the QR code below with WhatsApp on your phone:");
-    console.warn("   (Settings \u2192 Linked Devices \u2192 Link a Device)");
-    const qrRes = await fetch("http://localhost:2785/api/sessions/waify/qr", {
-      headers: { "X-API-Key": openwaApiKey }
-    });
-    if (!qrRes.ok) {
-      console.warn("   Could not fetch QR code \u2014 use the browser link below.");
-    }
-    const qrData = qrRes.ok ? QrResponseSchema.parse(await qrRes.json()) : { qr: void 0 };
-    const rawQr = qrData.qr ?? "";
-    const qrString = rawQr.startsWith("data:image/png;base64,") ? rawQr.slice("data:image/png;base64,".length) : rawQr;
-    qrcode.generate(qrString, { small: true });
-    console.warn("   Or open in browser: http://localhost:2886");
-    let connected = false;
-    for (let attempt = 0; attempt < 60; attempt++) {
-      try {
-        const statusRes = await fetch("http://localhost:2785/api/sessions/waify", {
-          headers: { "X-API-Key": openwaApiKey }
-        });
-        const parsed = StatusResponseSchema.safeParse(await statusRes.json());
-        if (!parsed.success) continue;
-        const statusData = parsed.data;
-        if (statusData.status === "CONNECTED" || statusData.connected === true) {
-          connected = true;
-          break;
+      const openwaApiKey = keyResult.stdout?.trim();
+      if (keyResult.status !== 0 || !openwaApiKey) {
+        console.error(
+          "Could not read API key from container. Check logs: docker compose -f " + composePath() + " logs openwa-api"
+        );
+        if (keyResult.stderr) console.error(keyResult.stderr);
+        process.exit(1);
+      }
+      console.warn("Creating WhatsApp session...");
+      const sessionRes = await fetchWithTimeout("http://localhost:2785/api/sessions", {
+        method: "POST",
+        headers: {
+          "X-API-Key": openwaApiKey,
+          "Content-Type": "application/json"
+        },
+        body: JSON.stringify({ name: "waify" })
+      }, 1e4);
+      if (!sessionRes.ok) {
+        throw new Error(`Failed to create session: ${sessionRes.status} ${sessionRes.statusText}`);
+      }
+      const sessionData = SessionResponseSchema.parse(await sessionRes.json());
+      const sessionId = sessionData.id ?? sessionData.name ?? "waify";
+      saveConfig({ ...loadConfig(), openwaApiKey, openwaSessionId: sessionId });
+      console.warn("Starting WhatsApp engine...");
+      const startRes = await fetchWithTimeout(`http://localhost:2785/api/sessions/${sessionId}/start`, {
+        method: "POST",
+        headers: { "X-API-Key": openwaApiKey }
+      }, 1e4);
+      if (!startRes.ok) {
+        throw new Error(`Failed to start session: ${startRes.status} ${startRes.statusText}`);
+      }
+      console.warn("Waiting for QR code...");
+      let qrReady = false;
+      for (let attempt = 0; attempt < 30; attempt++) {
+        try {
+          const qrRes = await fetchWithTimeout(`http://localhost:2785/api/sessions/${sessionId}/qr`, {
+            headers: { "X-API-Key": openwaApiKey }
+          });
+          if (qrRes.ok) {
+            const qrData = QrResponseSchema.parse(await qrRes.json());
+            if (qrData.qrCode) {
+              qrReady = true;
+              break;
+            }
+          }
+        } catch {
         }
-      } catch {
+        await wait(2e3);
       }
-      await wait(2e3);
-    }
-    if (!connected) {
-      console.error("WhatsApp did not connect within 2 minutes. Please re-run `waify setup` to try again.");
-      process.exit(1);
-    }
-    console.warn("\u2713 WhatsApp connected!");
-    const rl = createInterface({ input: process.stdin, output: process.stdout });
-    try {
-      let geminiKey = "";
-      while (!geminiKey.trim()) {
-        geminiKey = await promptLine(
-          rl,
-          "Enter your Gemini API key (get one free at https://aistudio.google.com/apikey):\n> "
-        );
-        if (!geminiKey.trim()) {
-          console.warn("Gemini API key cannot be empty. Please try again.");
+      console.warn("\n\u{1F4F1} Scan the QR code with WhatsApp to link your device:");
+      console.warn("   Settings \u2192 Linked Devices \u2192 Link a Device");
+      console.warn("   View QR at: http://localhost:2785/api/docs  (Sessions \u2192 GET /sessions/{id}/qr)");
+      if (!qrReady) {
+        console.warn("   (QR not yet ready \u2014 Chromium may still be initializing, check the Swagger link above)");
+      }
+      console.warn("   Waiting up to 2 minutes for you to scan...\n");
+      let connected = false;
+      for (let attempt = 0; attempt < 60; attempt++) {
+        try {
+          const statusRes = await fetchWithTimeout(`http://localhost:2785/api/sessions/${sessionId}`, {
+            headers: { "X-API-Key": openwaApiKey }
+          });
+          const parsed = StatusResponseSchema.safeParse(await statusRes.json());
+          if (!parsed.success) continue;
+          if (parsed.data.status === "ready") {
+            connected = true;
+            break;
+          }
+        } catch {
         }
+        await wait(2e3);
       }
-      saveSecrets({ GEMINI_API_KEY: geminiKey.trim() });
-      let recipientNumber = "";
-      const phoneRegex = /^\d{8,15}$/;
-      while (!phoneRegex.test(recipientNumber.trim())) {
-        recipientNumber = await promptLine(
-          rl,
-          "Enter your recipient's WhatsApp number (e.g. 5511999998888 \u2014 digits only, no + or spaces):\n> "
-        );
-        if (!phoneRegex.test(recipientNumber.trim())) {
-          console.warn("Invalid number format. Use digits only, 8\u201315 characters. Please try again.");
+      if (!connected) {
+        console.error("WhatsApp did not connect within 2 minutes. Please re-run `waify setup` to try again.");
+        process.exit(1);
+      }
+      console.warn("\u2713 WhatsApp connected!");
+      const rl = createInterface({ input: process.stdin, output: process.stdout });
+      try {
+        let geminiKey = "";
+        while (!geminiKey.trim()) {
+          geminiKey = await promptLine(
+            rl,
+            "Enter your Gemini API key (get one free at https://aistudio.google.com/apikey):\n> "
+          );
+          if (!geminiKey.trim()) {
+            console.warn("Gemini API key cannot be empty. Please try again.");
+          }
+        }
+        saveSecrets({ GEMINI_API_KEY: geminiKey.trim(), OPENWA_API_KEY: openwaApiKey });
+        let recipientNumber = "";
+        const phoneRegex = /^\d{8,15}$/;
+        while (!phoneRegex.test(recipientNumber.trim())) {
+          recipientNumber = await promptLine(
+            rl,
+            "Enter your recipient's WhatsApp number (e.g. 5511999998888 \u2014 digits only, no + or spaces):\n> "
+          );
+          if (!phoneRegex.test(recipientNumber.trim())) {
+            console.warn("Invalid number format. Use digits only, 8\u201315 characters. Please try again.");
+          }
         }
+        const chatId = `${recipientNumber.trim()}@c.us`;
+        saveConfig({ ...loadConfig(), recipients: [{ chatId }] });
+      } finally {
+        rl.close();
       }
-      const chatId = `${recipientNumber.trim()}@c.us`;
-      saveConfig({ ...loadConfig(), recipients: [{ chatId }] });
-    } finally {
-      rl.close();
-    }
-    if (!existsSync6(promptPath())) {
-      savePrompt(defaultPrompt);
-    }
-    if (!existsSync6(scheduleJsonPath())) {
-      saveSchedule(defaultSchedule);
+      if (!existsSync6(promptPath())) {
+        savePrompt(defaultPrompt);
+      }
+      if (!existsSync6(scheduleJsonPath())) {
+        saveSchedule(defaultSchedule);
+      }
+      console.warn("\n\u2713 All done! Run `waify send` to send your first message.");
+    } catch (err) {
+      console.error(err instanceof Error ? err.message : String(err));
+      process.exit(1);
     }
-    console.warn("\u2713 All done! Run `waify send` to send your first message.");
   });
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deckasoft/waify",
-  "version": "0.3.4",
+  "version": "0.3.5",
   "description": "AI-powered daily message sender for WhatsApp, powered by OpenWA",
   "keywords": [
     "whatsapp",
@@ -41,7 +41,6 @@
     "ink-select-input": "^6.2.0",
     "ink-spinner": "^5.0.0",
     "ink-text-input": "^6.0.0",
-    "qrcode-terminal": "^0.12.0",
     "react": "^19.2.6",
     "zod": "^3.24.0"
   },
@@ -49,7 +48,6 @@
     "@semantic-release/changelog": "^6.0.3",
     "@semantic-release/git": "^10.0.1",
     "@types/node": "^22.0.0",
-    "@types/qrcode-terminal": "^0.12.2",
     "@types/react": "^19.2.15",
     "semantic-release": "^25.0.3",
     "tsup": "^8.5.1",