@deckasoft/waify 0.3.7 → 0.3.9

package/dist/cli/index.js

@@ -969,6 +969,7 @@ var SessionResponseSchema = z5.object({
   id: z5.string().optional(),
   name: z5.string().optional()
 });
+var SessionListSchema = z5.array(SessionResponseSchema);
 var QrResponseSchema = z5.object({
   qrCode: z5.string().optional()
 });
@@ -1019,11 +1020,6 @@ var registerSetup = (program2) => {
       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(
@@ -1046,8 +1042,8 @@ var registerSetup = (program2) => {
         }
       }
       const chatId = `${recipientNumber.trim()}@c.us`;
-      saveSecrets({ GEMINI_API_KEY: geminiKey.trim(), OPENWA_API_KEY: openwaApiKey });
-      saveConfig({ ...loadConfig(), openwaApiKey, recipients: [{ chatId }] });
+      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)...");
@@ -1079,6 +1075,19 @@ var registerSetup = (program2) => {
         process.exitCode = 1;
         return;
       }
+      console.warn("Reading API key from container...");
+      const keyResult = spawnSync(
+        "docker",
+        ["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`);
+      }
+      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",
@@ -1088,17 +1097,32 @@ var registerSetup = (program2) => {
         },
         body: JSON.stringify({ name: "waify" })
       }, 1e4);
-      if (!sessionRes.ok) {
+      let sessionId;
+      if (sessionRes.status === 409) {
+        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}`);
+        }
+        const sessions = SessionListSchema.parse(await listRes.json());
+        const existing = sessions.find((s) => s.name === "waify");
+        if (!existing?.id) {
+          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}`);
+      } else {
+        const sessionData = SessionResponseSchema.parse(await sessionRes.json());
+        sessionId = sessionData.id ?? sessionData.name ?? "waify";
       }
-      const sessionData = SessionResponseSchema.parse(await sessionRes.json());
-      const sessionId = sessionData.id ?? sessionData.name ?? "waify";
       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) {
+      if (!startRes.ok && startRes.status !== 400) {
         throw new Error(`Failed to start session: ${startRes.status} ${startRes.statusText}`);
       }
       console.warn("Waiting for QR code...");

package/package.json

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