@deckasoft/waify 0.3.10 → 0.4.1

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;
+var dataDir, configPath, promptPath, scheduleJsonPath, schedulePath, logPath, envPath, composePath, 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");
+    qrImagePath = () => join(dataDir(), "qr.png");
   }
 });
 
@@ -203,7 +204,7 @@ var init_schedule = __esm({
 });
 
 // src/core/secrets.ts
-import { existsSync as existsSync5, readFileSync as readFileSync4, writeFileSync as writeFileSync4 } from "fs";
+import { existsSync as existsSync5, readFileSync as readFileSync4, writeFileSync as writeFileSync5 } from "fs";
 import { z as z4 } from "zod";
 var SecretsSchema, parseEnvFile, loadSecrets, tryLoadSecrets, saveSecrets;
 var init_secrets = __esm({
@@ -231,7 +232,7 @@ var init_secrets = __esm({
       const existing = existsSync5(path) ? parseEnvFile(readFileSync4(path, "utf-8")) : {};
       const merged = { ...existing, ...next };
       const body = Object.entries(merged).filter(([, v]) => typeof v === "string" && v.length > 0).map(([k, v]) => `${k}=${v}`).join("\n");
-      writeFileSync4(path, body + "\n", "utf-8");
+      writeFileSync5(path, body + "\n", "utf-8");
     };
   }
 });
@@ -307,8 +308,8 @@ var init_sender = __esm({
 });
 
 // src/core/logger.ts
-import { appendFileSync, existsSync as existsSync7, mkdirSync as mkdirSync5, readFileSync as readFileSync5 } from "fs";
-import { dirname as dirname4 } from "path";
+import { appendFileSync, existsSync as existsSync7, mkdirSync as mkdirSync6, readFileSync as readFileSync5 } from "fs";
+import { dirname as dirname5 } from "path";
 var log, LINE_RE, parseLine, readHistory;
 var init_logger = __esm({
   "src/core/logger.ts"() {
@@ -316,7 +317,7 @@ var init_logger = __esm({
     init_paths();
     log = (status, detail) => {
       const path = logPath();
-      mkdirSync5(dirname4(path), { recursive: true });
+      mkdirSync6(dirname5(path), { recursive: true });
       const timestamp = (/* @__PURE__ */ new Date()).toISOString();
       const line = `[${timestamp}] ${status.toUpperCase()} | ${detail}
 `;
@@ -953,17 +954,50 @@ var registerInit = (program2) => {
 };
 
 // src/cli/commands/setup.ts
-init_paths();
-init_config();
-init_secrets();
-init_schedule();
-init_prompt();
 import { spawnSync } from "child_process";
-import { existsSync as existsSync6, mkdirSync as mkdirSync4, writeFileSync as writeFileSync5 } from "fs";
+import { existsSync as existsSync6, mkdirSync as mkdirSync5, writeFileSync as writeFileSync6 } from "fs";
 import { homedir as homedir2 } from "os";
 import { join as join2 } from "path";
 import { createInterface } from "readline";
 import qrcode from "qrcode-terminal";
+
+// src/core/qr.ts
+init_paths();
+import { mkdirSync as mkdirSync4, writeFileSync as writeFileSync4 } from "fs";
+import { dirname as dirname4 } from "path";
+import { PNG } from "pngjs";
+import jsQR from "jsqr";
+var stripDataUrlPrefix = (dataUrl) => dataUrl.replace(/^data:image\/\w+;base64,/, "");
+var decodeQrDataUrl = (dataUrl) => {
+  try {
+    const buffer = Buffer.from(stripDataUrlPrefix(dataUrl), "base64");
+    const png = PNG.sync.read(buffer);
+    const result = jsQR(new Uint8ClampedArray(png.data), png.width, png.height);
+    return result?.data ?? null;
+  } catch {
+    return null;
+  }
+};
+var saveQrImage = (dataUrl) => {
+  try {
+    const buffer = Buffer.from(stripDataUrlPrefix(dataUrl), "base64");
+    const path = qrImagePath();
+    mkdirSync4(dirname4(path), { recursive: true });
+    writeFileSync4(path, buffer);
+    return path;
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err);
+    console.warn(`Could not save QR image: ${msg}`);
+    return null;
+  }
+};
+
+// src/cli/commands/setup.ts
+init_paths();
+init_config();
+init_secrets();
+init_schedule();
+init_prompt();
 import { z as z5 } from "zod";
 var SessionResponseSchema = z5.object({
   id: z5.string().optional(),
@@ -976,8 +1010,76 @@ var QrResponseSchema = z5.object({
 var StatusResponseSchema = z5.object({
   status: z5.string().optional()
 });
+var SESSION_NAME = "waify";
+var SPINNER_FRAMES = [
+  "\u280B",
+  "\u2819",
+  "\u2839",
+  "\u2838",
+  "\u283C",
+  "\u2834",
+  "\u2826",
+  "\u2827",
+  "\u2807",
+  "\u280F"
+];
+var createSpinner = (message) => {
+  let current = message;
+  let frame = 0;
+  const interval = setInterval(() => {
+    process.stderr.write(`\r${SPINNER_FRAMES[frame % SPINNER_FRAMES.length]} ${current}`);
+    frame++;
+  }, 80).unref();
+  return {
+    update: (msg) => {
+      current = msg;
+    },
+    succeed: (msg) => {
+      clearInterval(interval);
+      process.stderr.write(`\r\u2713 ${msg}
+`);
+    },
+    fail: (msg) => {
+      clearInterval(interval);
+      process.stderr.write(`\r\u2717 ${msg}
+`);
+    },
+    stop: () => {
+      clearInterval(interval);
+      process.stderr.write("\r\x1B[K");
+    }
+  };
+};
 var wait = (ms) => new Promise((resolve2) => setTimeout(resolve2, ms));
 var fetchWithTimeout = (url, opts = {}, timeoutMs = 5e3) => fetch(url, { ...opts, signal: AbortSignal.timeout(timeoutMs) });
+var renderQrInTerminal = (dataUrl) => {
+  const raw = decodeQrDataUrl(dataUrl);
+  if (!raw) return false;
+  qrcode.generate(raw, { small: true });
+  return true;
+};
+var presentQr = (dataUrl, sessionId, baseUrl, apiKey) => {
+  const rendered = renderQrInTerminal(dataUrl);
+  if (!rendered) {
+    console.warn(
+      "   (Could not decode QR image \u2014 use the saved PNG or curl command below)"
+    );
+  }
+  const savedPath = saveQrImage(dataUrl);
+  if (savedPath) {
+    console.warn(`
+   QR also saved to: ${savedPath}`);
+    console.warn(`   Open it with:    open ${savedPath}`);
+  }
+  console.warn("\n   To re-fetch the QR if it expires:");
+  console.warn(
+    `     curl -s -H "X-API-Key: ${apiKey}" ${baseUrl}/api/sessions/${sessionId}/qr \\`
+  );
+  console.warn(
+    `       | sed 's/.*"qrCode":"data:image\\/png;base64,//;s/".*//' \\`
+  );
+  console.warn(`       | base64 -d > waify-qr.png`);
+};
 var composeTemplate = () => `services:
   openwa-api:
     image: ghcr.io/deckasoft/openwa:latest
@@ -1004,21 +1106,37 @@ var composeTemplate = () => `services:
 volumes:
   openwa-data:
 `;
+var finalizeSetup = (sessionId) => {
+  saveConfig({ ...loadConfig(), openwaSessionId: sessionId });
+  if (!existsSync6(promptPath())) {
+    savePrompt(defaultPrompt);
+  }
+  if (!existsSync6(scheduleJsonPath())) {
+    saveSchedule(defaultSchedule);
+  }
+  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 renderQr = (qrString) => new Promise((resolve2) => qrcode.generate(qrString, { small: true }, () => resolve2()));
 var registerSetup = (program2) => {
-  program2.command("setup").description("Guided first-run wizard: installs OpenWA, authenticates WhatsApp, and configures waify").action(async () => {
-    const rl = createInterface({ input: process.stdin, output: process.stdout });
+  program2.command("setup").description(
+    "Guided first-run wizard: installs OpenWA, authenticates WhatsApp, and configures waify"
+  ).action(async () => {
+    const rl = createInterface({
+      input: process.stdin,
+      output: process.stdout
+    });
     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.");
+        console.error(
+          "Docker is not running or not installed. Please install Docker and start it before running setup."
+        );
         process.exitCode = 1;
         return;
       }
       console.warn("Creating config directory...");
-      mkdirSync4(join2(homedir2(), ".config", "waify"), { recursive: true });
+      mkdirSync5(join2(homedir2(), ".config", "waify"), { recursive: true });
       const baseUrl = loadConfig().openwaBaseUrl;
       let geminiKey = "";
       while (!geminiKey.trim()) {
@@ -1038,24 +1156,42 @@ var registerSetup = (program2) => {
           "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.");
+          console.warn(
+            "Invalid number format. Use digits only, 8\u201315 characters. Please try again."
+          );
         }
       }
       const chatId = `${recipientNumber.trim()}@c.us`;
       saveSecrets({ GEMINI_API_KEY: geminiKey.trim(), OPENWA_API_KEY: "" });
       saveConfig({ ...loadConfig(), recipients: [{ chatId }] });
       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"
-      });
+      writeFileSync6(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.");
+        console.error(
+          "Failed to start OpenWA containers. Check docker compose logs for details."
+        );
         process.exitCode = 1;
         return;
       }
-      console.warn("Waiting for OpenWA API to start...");
+      const apiSpinner = createSpinner("Waiting for OpenWA API to start...");
       let apiReady = false;
       for (let attempt = 0; attempt < 30; attempt++) {
         try {
@@ -1069,53 +1205,84 @@ var registerSetup = (program2) => {
         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"
+        apiSpinner.fail(
+          `OpenWA API did not become ready in time. Check logs with: docker compose -f ${composePath()} logs openwa-api`
         );
         process.exitCode = 1;
         return;
       }
+      apiSpinner.succeed("OpenWA API is ready");
       console.warn("Reading API key from container...");
       const keyResult = spawnSync(
         "docker",
-        ["compose", "-f", composePath(), "exec", "-T", "openwa-api", "cat", "/app/data/.api-key"],
+        [
+          "compose",
+          "-f",
+          composePath(),
+          "exec",
+          "-T",
+          "openwa-api",
+          "cat",
+          "/app/data/.api-key"
+        ],
         { encoding: "utf-8" }
       );
       const openwaApiKey = keyResult.stdout?.trim();
       if (keyResult.status !== 0 || !openwaApiKey) {
         const errorMsg = keyResult.stderr?.trim() || "Could not read API key from container.";
-        throw new Error(`${errorMsg} Check logs with: docker compose -f ${composePath()} logs openwa-api`);
+        throw new Error(
+          `${errorMsg} Check logs with: docker compose -f ${composePath()} logs openwa-api`
+        );
       }
-      saveSecrets({ GEMINI_API_KEY: geminiKey.trim(), OPENWA_API_KEY: openwaApiKey });
+      saveSecrets({
+        GEMINI_API_KEY: geminiKey.trim(),
+        OPENWA_API_KEY: openwaApiKey
+      });
       saveConfig({ ...loadConfig(), openwaApiKey, recipients: [{ chatId }] });
       console.warn("Creating WhatsApp session...");
-      const sessionRes = await fetchWithTimeout(`${baseUrl}/api/sessions`, {
-        method: "POST",
-        headers: {
-          "X-API-Key": openwaApiKey,
-          "Content-Type": "application/json"
+      const sessionRes = await fetchWithTimeout(
+        `${baseUrl}/api/sessions`,
+        {
+          method: "POST",
+          headers: {
+            "X-API-Key": openwaApiKey,
+            "Content-Type": "application/json"
+          },
+          body: JSON.stringify({ name: SESSION_NAME })
         },
-        body: JSON.stringify({ name: "waify" })
-      }, 1e4);
+        1e4
+      );
       let sessionId;
       if (sessionRes.status === 409) {
-        const listRes = await fetchWithTimeout(`${baseUrl}/api/sessions`, {
-          headers: { "X-API-Key": openwaApiKey }
-        }, 1e4);
+        const listRes = await fetchWithTimeout(
+          `${baseUrl}/api/sessions`,
+          {
+            headers: { "X-API-Key": openwaApiKey }
+          },
+          1e4
+        );
         if (!listRes.ok) {
-          throw new Error(`Failed to list sessions: ${listRes.status} ${listRes.statusText}`);
+          throw new Error(
+            `Failed to list sessions: ${listRes.status} ${listRes.statusText}`
+          );
         }
         const sessions = SessionListSchema.parse(await listRes.json());
-        const existing = sessions.find((s) => s.name === "waify");
+        const existing = sessions.find((s) => s.name === SESSION_NAME);
         if (!existing?.id) {
-          throw new Error('Session "waify" already exists but could not be retrieved');
+          throw new Error(
+            'Session "waify" already exists but could not be retrieved'
+          );
         }
         sessionId = existing.id;
       } else if (!sessionRes.ok) {
-        throw new Error(`Failed to create session: ${sessionRes.status} ${sessionRes.statusText}`);
+        throw new Error(
+          `Failed to create session: ${sessionRes.status} ${sessionRes.statusText}`
+        );
       } else {
-        const sessionData = SessionResponseSchema.parse(await sessionRes.json());
-        sessionId = sessionData.id ?? sessionData.name ?? "waify";
+        const sessionData = SessionResponseSchema.parse(
+          await sessionRes.json()
+        );
+        sessionId = sessionData.id ?? sessionData.name ?? SESSION_NAME;
       }
       spawnSync(
         "docker",
@@ -1128,25 +1295,54 @@ var registerSetup = (program2) => {
           "openwa-api",
           "sh",
           "-c",
-          "rm -f /app/data/sessions/session-waify/Singleton*"
+          `rm -f /app/data/sessions/session-${SESSION_NAME}/Singleton*`
         ],
         { 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);
+      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}`);
+        throw new Error(
+          `Failed to start session: ${startRes.status} ${startRes.statusText}`
+        );
       }
-      console.warn("Waiting for QR code...");
+      try {
+        const preStatusRes = await fetchWithTimeout(
+          `${baseUrl}/api/sessions/${sessionId}`,
+          { headers: { "X-API-Key": openwaApiKey } }
+        );
+        if (preStatusRes.ok) {
+          const preStatus = StatusResponseSchema.safeParse(
+            await preStatusRes.json()
+          );
+          if (preStatus.success && preStatus.data.status === "ready") {
+            console.warn("\u2713 WhatsApp already linked \u2014 skipping QR scan");
+            finalizeSetup(sessionId);
+            return;
+          }
+        }
+      } catch {
+      }
+      const qrSpinner = createSpinner("Waiting for QR code (Chromium is starting)...");
       let qrCode;
-      for (let attempt = 0; attempt < 30; attempt++) {
+      const qrStart = Date.now();
+      for (let attempt = 0; attempt < 150; attempt++) {
+        const elapsed = Math.round((Date.now() - qrStart) / 1e3);
+        qrSpinner.update(`Waiting for QR code... (${elapsed}s / 5 min)`);
         try {
-          const qrRes = await fetchWithTimeout(`${baseUrl}/api/sessions/${sessionId}/qr`, {
-            headers: { "X-API-Key": openwaApiKey }
-          });
+          const qrRes = await fetchWithTimeout(
+            `${baseUrl}/api/sessions/${sessionId}/qr`,
+            {
+              headers: { "X-API-Key": openwaApiKey }
+            }
+          );
           if (qrRes.ok) {
             const qrData = QrResponseSchema.parse(await qrRes.json());
             if (qrData.qrCode) {
@@ -1158,23 +1354,36 @@ var registerSetup = (program2) => {
         }
         await wait(2e3);
       }
-      console.warn("\n\u{1F4F1} Scan the QR code with WhatsApp to link your device:");
+      qrSpinner.stop();
+      console.warn(
+        "\n\u{1F4F1} Scan the QR code below with WhatsApp to link your device:"
+      );
       console.warn("   Settings \u2192 Linked Devices \u2192 Link a Device\n");
       if (qrCode) {
-        await renderQr(qrCode);
-        console.warn("\n   (QR expires in ~20s \u2014 re-run setup if it expires before you scan)");
+        presentQr(qrCode, sessionId, baseUrl, openwaApiKey);
+        console.warn(
+          "\n   (QR expires in ~20s \u2014 re-run setup if it expires before you scan)"
+        );
       } else {
-        console.warn(`   QR not yet ready. Check: ${baseUrl}/api/sessions/${sessionId}/qr`);
-        console.warn(`   (Add header: X-API-Key: ${openwaApiKey})`);
+        console.warn(
+          "   QR code was not ready in time. Re-run `waify setup` to try again."
+        );
       }
-      console.warn("   Waiting up to 2 minutes for you to scan...\n");
+      const connectSpinner = createSpinner(
+        "Waiting for you to scan the QR code..."
+      );
       let connected = false;
       for (let attempt = 0; attempt < 60; attempt++) {
         try {
-          const statusRes = await fetchWithTimeout(`${baseUrl}/api/sessions/${sessionId}`, {
-            headers: { "X-API-Key": openwaApiKey }
-          });
-          const parsed = StatusResponseSchema.safeParse(await statusRes.json());
+          const statusRes = await fetchWithTimeout(
+            `${baseUrl}/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;
@@ -1185,19 +1394,14 @@ var registerSetup = (program2) => {
         await wait(2e3);
       }
       if (!connected) {
-        console.error("WhatsApp did not connect within 2 minutes. Please re-run `waify setup` to try again.");
+        connectSpinner.fail(
+          "WhatsApp did not connect within 2 minutes. Please re-run `waify setup` to try again."
+        );
         process.exitCode = 1;
         return;
       }
-      console.warn("\u2713 WhatsApp connected!");
-      saveConfig({ ...loadConfig(), openwaSessionId: sessionId });
-      if (!existsSync6(promptPath())) {
-        savePrompt(defaultPrompt);
-      }
-      if (!existsSync6(scheduleJsonPath())) {
-        saveSchedule(defaultSchedule);
-      }
-      console.warn("\n\u2713 All done! Run `waify send` to send your first message.");
+      connectSpinner.succeed("WhatsApp connected!");
+      finalizeSetup(sessionId);
     } 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.3.10",
+  "version": "0.4.1",
   "description": "AI-powered daily message sender for WhatsApp, powered by OpenWA",
   "keywords": [
     "whatsapp",
@@ -41,6 +41,8 @@
     "ink-select-input": "^6.2.0",
     "ink-spinner": "^5.0.0",
     "ink-text-input": "^6.0.0",
+    "jsqr": "^1.4.0",
+    "pngjs": "^7.0.0",
     "qrcode-terminal": "^0.12.0",
     "react": "^19.2.6",
     "zod": "^3.24.0"
@@ -49,8 +51,11 @@
     "@semantic-release/changelog": "^6.0.3",
     "@semantic-release/git": "^10.0.1",
     "@types/node": "^22.0.0",
+    "@types/pngjs": "^6.0.5",
+    "@types/qrcode": "^1.5.6",
     "@types/qrcode-terminal": "^0.12.2",
     "@types/react": "^19.2.15",
+    "qrcode": "^1.5.4",
     "semantic-release": "^25.0.3",
     "tsup": "^8.5.1",
     "tsx": "^4.19.0",