@deckasoft/waify 0.4.0 → 0.4.2

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}
 `;
@@ -887,7 +888,8 @@ var init_start = __esm({
 });
 
 // src/cli/index.ts
-import "dotenv/config";
+init_paths();
+import { config as dotenvConfig } from "dotenv";
 import { Command } from "commander";
 
 // src/cli/commands/init.ts
@@ -953,19 +955,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(),
@@ -1020,24 +1053,34 @@ var createSpinner = (message) => {
 };
 var wait = (ms) => new Promise((resolve2) => setTimeout(resolve2, ms));
 var fetchWithTimeout = (url, opts = {}, timeoutMs = 5e3) => fetch(url, { ...opts, signal: AbortSignal.timeout(timeoutMs) });
-var decodeQrDataUrl = (dataUrl) => {
-  const base64 = dataUrl.replace(/^data:image\/\w+;base64,/, "");
-  const buffer = Buffer.from(base64, "base64");
-  const png = PNG.sync.read(buffer);
-  const result = jsQR(new Uint8ClampedArray(png.data), png.width, png.height);
-  return result?.data ?? null;
-};
-var renderQrInTerminal = (dataUrl) => new Promise((resolve2) => {
+var renderQrInTerminal = (dataUrl) => {
   const raw = decodeQrDataUrl(dataUrl);
-  if (raw) {
-    qrcode.generate(raw, { small: true }, () => resolve2());
-  } else {
+  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 try scanning from the API URL instead)"
+      "   (Could not decode QR image \u2014 use the saved PNG or curl command below)"
     );
-    resolve2();
   }
-});
+  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
@@ -1064,6 +1107,16 @@ 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 registerSetup = (program2) => {
   program2.command("setup").description(
@@ -1084,7 +1137,7 @@ var registerSetup = (program2) => {
         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()) {
@@ -1113,7 +1166,7 @@ var registerSetup = (program2) => {
       saveSecrets({ GEMINI_API_KEY: geminiKey.trim(), OPENWA_API_KEY: "" });
       saveConfig({ ...loadConfig(), recipients: [{ chatId }] });
       console.warn("Writing docker-compose.yml...");
-      writeFileSync5(composePath(), composeTemplate(), "utf-8");
+      writeFileSync6(composePath(), composeTemplate(), "utf-8");
       console.warn(
         "Starting OpenWA containers (this may take a minute on first run)..."
       );
@@ -1248,18 +1301,45 @@ 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 }
+          },
+          3e4
+        );
+        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") {
+          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(
+          `${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;
@@ -1291,7 +1371,7 @@ var registerSetup = (program2) => {
       );
       console.warn("   Settings \u2192 Linked Devices \u2192 Link a Device\n");
       if (qrCode) {
-        await renderQrInTerminal(qrCode);
+        presentQr(qrCode, sessionId, baseUrl, openwaApiKey);
         console.warn(
           "\n   (QR expires in ~20s \u2014 re-run setup if it expires before you scan)"
         );
@@ -1332,16 +1412,7 @@ var registerSetup = (program2) => {
         return;
       }
       connectSpinner.succeed("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."
-      );
+      finalizeSetup(sessionId);
     } catch (err) {
       console.error(err instanceof Error ? err.message : String(err));
       process.exitCode = 1;
@@ -1580,6 +1651,7 @@ var registerTui = (program2) => {
 };
 
 // src/cli/index.ts
+dotenvConfig({ path: envPath() });
 var program = new Command();
 program.name("waify").description("AI-powered daily message sender for WhatsApp").version("0.1.0");
 registerInit(program);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deckasoft/waify",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "description": "AI-powered daily message sender for WhatsApp, powered by OpenWA",
   "keywords": [
     "whatsapp",
@@ -52,8 +52,10 @@
     "@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",