@deckasoft/waify 0.3.5 → 0.3.6

package/dist/cli/index.js

@@ -212,7 +212,7 @@ var init_secrets = __esm({
     init_paths();
     SecretsSchema = z4.object({
       GEMINI_API_KEY: z4.string().min(1),
-      OPENWA_API_KEY: z4.string().min(1)
+      OPENWA_API_KEY: z4.string().min(1).default("dev-admin-key")
     });
     parseEnvFile = (content) => content.split("\n").map((line) => line.trim()).filter((line) => line.length > 0 && !line.startsWith("#")).reduce((acc, line) => {
       const eq = line.indexOf("=");
@@ -963,6 +963,7 @@ 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 qrcode from "qrcode-terminal";
 import { z as z5 } from "zod";
 var SessionResponseSchema = z5.object({
   id: z5.string().optional(),
@@ -1009,17 +1010,50 @@ volumes:
   openwa-data:
 `;
 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 });
     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);
+        process.exitCode = 1;
+        return;
       }
       console.warn("Creating config directory...");
       mkdirSync4(join2(homedir2(), ".config", "waify"), { recursive: true });
+      const baseUrl = loadConfig().openwaBaseUrl;
+      const rawApiKey = await promptLine(
+        rl,
+        'OpenWA API key (press Enter to use default "dev-admin-key"):\n> '
+      );
+      const openwaApiKey = rawApiKey.trim() || "dev-admin-key";
+      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.");
+        }
+      }
+      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`;
+      saveSecrets({ GEMINI_API_KEY: geminiKey.trim(), OPENWA_API_KEY: openwaApiKey });
+      saveConfig({ ...loadConfig(), openwaApiKey, 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)...");
@@ -1028,13 +1062,14 @@ var registerSetup = (program2) => {
       });
       if (upResult.status !== 0) {
         console.error("Failed to start OpenWA containers. Check docker compose logs for details.");
-        process.exit(1);
+        process.exitCode = 1;
+        return;
       }
       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");
+          const res = await fetchWithTimeout(`${baseUrl}/api/health`);
           if (res.status >= 200 && res.status < 300) {
             apiReady = true;
             break;
@@ -1047,24 +1082,11 @@ var registerSetup = (program2) => {
         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" }
-      );
-      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);
+        process.exitCode = 1;
+        return;
       }
       console.warn("Creating WhatsApp session...");
-      const sessionRes = await fetchWithTimeout("http://localhost:2785/api/sessions", {
+      const sessionRes = await fetchWithTimeout(`${baseUrl}/api/sessions`, {
         method: "POST",
         headers: {
           "X-API-Key": openwaApiKey,
@@ -1077,9 +1099,8 @@ var registerSetup = (program2) => {
       }
       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`, {
+      const startRes = await fetchWithTimeout(`${baseUrl}/api/sessions/${sessionId}/start`, {
         method: "POST",
         headers: { "X-API-Key": openwaApiKey }
       }, 1e4);
@@ -1087,16 +1108,16 @@ var registerSetup = (program2) => {
         throw new Error(`Failed to start session: ${startRes.status} ${startRes.statusText}`);
       }
       console.warn("Waiting for QR code...");
-      let qrReady = false;
+      let qrCode;
       for (let attempt = 0; attempt < 30; attempt++) {
         try {
-          const qrRes = await fetchWithTimeout(`http://localhost:2785/api/sessions/${sessionId}/qr`, {
+          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) {
-              qrReady = true;
+              qrCode = qrData.qrCode;
               break;
             }
           }
@@ -1105,16 +1126,19 @@ var registerSetup = (program2) => {
         await wait(2e3);
       }
       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("   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)");
+      } else {
+        console.warn(`   QR not yet ready. Check: ${baseUrl}/api/sessions/${sessionId}/qr`);
+        console.warn(`   (Add header: X-API-Key: ${openwaApiKey})`);
       }
       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}`, {
+          const statusRes = await fetchWithTimeout(`${baseUrl}/api/sessions/${sessionId}`, {
             headers: { "X-API-Key": openwaApiKey }
           });
           const parsed = StatusResponseSchema.safeParse(await statusRes.json());
@@ -1129,38 +1153,11 @@ var registerSetup = (program2) => {
       }
       if (!connected) {
         console.error("WhatsApp did not connect within 2 minutes. Please re-run `waify setup` to try again.");
-        process.exit(1);
+        process.exitCode = 1;
+        return;
       }
       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();
-      }
+      saveConfig({ ...loadConfig(), openwaSessionId: sessionId });
       if (!existsSync6(promptPath())) {
         savePrompt(defaultPrompt);
       }
@@ -1170,7 +1167,9 @@ var registerSetup = (program2) => {
       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);
+      process.exitCode = 1;
+    } finally {
+      rl.close();
     }
   });
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deckasoft/waify",
-  "version": "0.3.5",
+  "version": "0.3.6",
   "description": "AI-powered daily message sender for WhatsApp, powered by OpenWA",
   "keywords": [
     "whatsapp",
@@ -41,6 +41,7 @@
     "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"
   },
@@ -48,6 +49,7 @@
     "@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",