@leg3ndy/otto-bridge 0.8.2 → 0.8.3

package/dist/executors/native_macos.js

@@ -7,6 +7,7 @@ import { JobCancelledError } from "./shared.js";
 import { loadManagedBridgeExtensionState, saveManagedBridgeExtensionState, } from "../extensions.js";
 import { postDeviceJson, uploadDeviceJobArtifact } from "../http.js";
 import { WHATSAPP_WEB_URL, WhatsAppBackgroundBrowser, } from "../whatsapp_background.js";
+import { verifyExpectedWhatsAppMessage } from "../whatsapp_verification.js";
 const KNOWN_APPS = [
     { canonical: "Safari", patterns: [/\bsafari\b/i] },
     { canonical: "Google Chrome", patterns: [/\bgoogle chrome\b/i, /\bchrome\b/i] },
@@ -1344,10 +1345,6 @@ export class NativeMacOSJobExecutor {
                     await reporter.progress(progressPercent, `Enviando a mensagem para ${action.contact} no WhatsApp`);
                     await this.sendWhatsAppMessage(action.text);
                     await delay(900);
-                    const verification = await this.verifyWhatsAppLastMessageAgainstBaseline(action.text, beforeSend.messages);
-                    if (!verification.ok) {
-                        throw new Error(verification.reason || `Nao consegui confirmar o envio da mensagem para ${action.contact} no WhatsApp.`);
-                    }
                     const afterSend = await this.readWhatsAppVisibleConversation(action.contact, Math.max(12, beforeSend.messages.length + 4)).catch(() => null);
                     resultPayload.whatsapp = {
                         action: "send_message",
@@ -1356,6 +1353,12 @@ export class NativeMacOSJobExecutor {
                         messages: afterSend?.messages || [],
                         summary: afterSend?.summary || "",
                     };
+                    const verification = await this.verifyWhatsAppLastMessageAgainstBaseline(action.text, beforeSend.messages);
+                    if (!verification.ok) {
+                        resultPayload.summary = verification.reason || `Nao consegui confirmar o envio da mensagem para ${action.contact} no WhatsApp.`;
+                        await reporter.failed(verification.reason || `Nao consegui confirmar o envio da mensagem para ${action.contact} no WhatsApp.`, resultPayload);
+                        return;
+                    }
                     completionNotes.push(`Enviei no WhatsApp para ${action.contact}: ${clipText(action.text, 180)}`);
                     continue;
                 }
@@ -3164,42 +3167,7 @@ return { messages: messages.slice(-maxMessages) };
         }
         const baseline = Array.isArray(previousMessages) ? previousMessages : [];
         const chat = await this.readWhatsAppVisibleConversation("Contato", Math.max(8, baseline.length + 2));
-        if (!chat.messages.length) {
-            return {
-                ok: false,
-                reason: "Nao consegui ler as mensagens visiveis apos o envio no WhatsApp.",
-            };
-        }
-        const normalizedExpected = normalizeText(expectedText).slice(0, 120);
-        const normalizeMessage = (item) => `${normalizeText(item.author)}|${normalizeText(item.text)}`;
-        const beforeSignature = baseline.map(normalizeMessage).join("\n");
-        const afterSignature = chat.messages.map(normalizeMessage).join("\n");
-        const changed = beforeSignature !== afterSignature;
-        const beforeMatches = baseline.filter((item) => normalizeText(item.text).includes(normalizedExpected)).length;
-        const afterMatches = chat.messages.filter((item) => normalizeText(item.text).includes(normalizedExpected)).length;
-        const latest = chat.messages[chat.messages.length - 1] || null;
-        const latestAuthor = normalizeText(latest?.author || "");
-        const latestText = normalizeText(latest?.text || "");
-        const latestMatches = latestText.includes(normalizedExpected) && (latestAuthor === "voce" || latestAuthor === "você");
-        if ((changed && latestMatches) || (changed && afterMatches > beforeMatches)) {
-            return { ok: true, reason: "" };
-        }
-        if (!changed) {
-            return {
-                ok: false,
-                reason: "O WhatsApp nao mostrou mudanca visivel na conversa depois da tentativa de envio.",
-            };
-        }
-        if (afterMatches <= beforeMatches) {
-            return {
-                ok: false,
-                reason: "A conversa mudou, mas nao apareceu uma nova mensagem com o texto esperado no WhatsApp.",
-            };
-        }
-        return {
-            ok: false,
-            reason: "Nao consegui confirmar visualmente a nova mensagem enviada no WhatsApp.",
-        };
+        return verifyExpectedWhatsAppMessage(expectedText, baseline, chat.messages);
     }
     async takeScreenshot(targetPath) {
         const artifactsDir = path.join(os.homedir(), ".otto-bridge", "artifacts");

package/dist/macos_whatsapp_helper.js

@@ -5,16 +5,10 @@ import path from "node:path";
 import process from "node:process";
 import { getBridgeHomeDir } from "./config.js";
 import { MACOS_WHATSAPP_HELPER_SWIFT_SOURCE } from "./macos_whatsapp_helper_source.js";
+import { verifyExpectedWhatsAppMessage } from "./whatsapp_verification.js";
 function delay(ms) {
     return new Promise((resolve) => setTimeout(resolve, ms));
 }
-function normalizeText(value) {
-    return String(value || "")
-        .normalize("NFD")
-        .replace(/[\u0300-\u036f]/g, "")
-        .toLowerCase()
-        .trim();
-}
 async function runHelperCommand(command, args) {
     return await new Promise((resolve, reject) => {
         const child = spawn(command, args, { stdio: ["ignore", "pipe", "pipe"] });
@@ -743,42 +737,7 @@ export class MacOSWhatsAppHelperRuntime {
     async verifyLastMessage(expectedText, previousMessages) {
         const baseline = Array.isArray(previousMessages) ? previousMessages : [];
         const chat = await this.readVisibleConversation(Math.max(8, baseline.length + 2));
-        if (!chat.messages.length) {
-            return {
-                ok: false,
-                reason: "Nao consegui ler as mensagens visiveis apos o envio no WhatsApp.",
-            };
-        }
-        const normalizedExpected = normalizeText(expectedText).slice(0, 120);
-        const normalizeMessage = (item) => `${normalizeText(item.author)}|${normalizeText(item.text)}`;
-        const beforeSignature = baseline.map(normalizeMessage).join("\n");
-        const afterSignature = chat.messages.map(normalizeMessage).join("\n");
-        const changed = beforeSignature !== afterSignature;
-        const beforeMatches = baseline.filter((item) => normalizeText(item.text).includes(normalizedExpected)).length;
-        const afterMatches = chat.messages.filter((item) => normalizeText(item.text).includes(normalizedExpected)).length;
-        const latest = chat.messages[chat.messages.length - 1] || null;
-        const latestAuthor = normalizeText(latest?.author || "");
-        const latestText = normalizeText(latest?.text || "");
-        const latestMatches = latestText.includes(normalizedExpected) && (latestAuthor === "voce" || latestAuthor === "você");
-        if ((changed && latestMatches) || (changed && afterMatches > beforeMatches)) {
-            return { ok: true, reason: "" };
-        }
-        if (!changed) {
-            return {
-                ok: false,
-                reason: "O WhatsApp nao mostrou mudanca visivel na conversa depois da tentativa de envio.",
-            };
-        }
-        if (afterMatches <= beforeMatches) {
-            return {
-                ok: false,
-                reason: "A conversa mudou, mas nao apareceu uma nova mensagem com o texto esperado no WhatsApp.",
-            };
-        }
-        return {
-            ok: false,
-            reason: "Nao consegui confirmar na conversa do WhatsApp se a nova mensagem foi enviada.",
-        };
+        return verifyExpectedWhatsAppMessage(expectedText, baseline, chat.messages);
     }
     handleStdout(chunk) {
         this.stdoutBuffer += chunk;

package/dist/types.js

@@ -1,5 +1,5 @@
 export const BRIDGE_CONFIG_VERSION = 1;
-export const BRIDGE_VERSION = "0.8.2";
+export const BRIDGE_VERSION = "0.8.3";
 export const BRIDGE_PACKAGE_NAME = "@leg3ndy/otto-bridge";
 export const DEFAULT_API_BASE_URL = "http://localhost:8000";
 export const DEFAULT_POLL_INTERVAL_MS = 3000;

package/dist/whatsapp_background.js

@@ -5,6 +5,7 @@ import process from "node:process";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import { getBridgeHomeDir } from "./config.js";
 import { checkMacOSWhatsAppHelperAvailability, MacOSWhatsAppHelperRuntime, } from "./macos_whatsapp_helper.js";
+import { verifyExpectedWhatsAppMessage } from "./whatsapp_verification.js";
 import { getConfiguredWhatsAppRuntimeProvider } from "./whatsapp_runtime_provider.js";
 export const WHATSAPP_WEB_URL = "https://web.whatsapp.com";
 const DEFAULT_SETUP_TIMEOUT_MS = 5 * 60 * 1000;
@@ -44,13 +45,6 @@ async function loadEmbeddedPlaywrightModule() {
     }
     throw new Error(`Playwright nao esta disponivel para o Otto Bridge. Reinstale o pacote \`@leg3ndy/otto-bridge\` para garantir o browser persistente do bridge. ${errors.length ? `Detalhes: ${errors.join(" | ")}` : ""}`.trim());
 }
-function normalizeText(value) {
-    return String(value || "")
-        .normalize("NFD")
-        .replace(/[\u0300-\u036f]/g, "")
-        .toLowerCase()
-        .trim();
-}
 export function getWhatsAppBrowserUserDataDir() {
     return path.join(getBridgeHomeDir(), "extensions", "whatsappweb-profile");
 }
@@ -806,42 +800,7 @@ export class WhatsAppBackgroundBrowser {
         }
         const baseline = Array.isArray(previousMessages) ? previousMessages : [];
         const chat = await this.readVisibleConversation(Math.max(8, baseline.length + 2));
-        if (!chat.messages.length) {
-            return {
-                ok: false,
-                reason: "Nao consegui ler as mensagens visiveis apos o envio no WhatsApp.",
-            };
-        }
-        const normalizedExpected = normalizeText(expectedText).slice(0, 120);
-        const normalizeMessage = (item) => `${normalizeText(item.author)}|${normalizeText(item.text)}`;
-        const beforeSignature = baseline.map(normalizeMessage).join("\n");
-        const afterSignature = chat.messages.map(normalizeMessage).join("\n");
-        const changed = beforeSignature !== afterSignature;
-        const beforeMatches = baseline.filter((item) => normalizeText(item.text).includes(normalizedExpected)).length;
-        const afterMatches = chat.messages.filter((item) => normalizeText(item.text).includes(normalizedExpected)).length;
-        const latest = chat.messages[chat.messages.length - 1] || null;
-        const latestAuthor = normalizeText(latest?.author || "");
-        const latestText = normalizeText(latest?.text || "");
-        const latestMatches = latestText.includes(normalizedExpected) && (latestAuthor === "voce" || latestAuthor === "você");
-        if ((changed && latestMatches) || (changed && afterMatches > beforeMatches)) {
-            return { ok: true, reason: "" };
-        }
-        if (!changed) {
-            return {
-                ok: false,
-                reason: "O WhatsApp nao mostrou mudanca visivel na conversa depois da tentativa de envio.",
-            };
-        }
-        if (afterMatches <= beforeMatches) {
-            return {
-                ok: false,
-                reason: "A conversa mudou, mas nao apareceu uma nova mensagem com o texto esperado no WhatsApp.",
-            };
-        }
-        return {
-            ok: false,
-            reason: "Nao consegui confirmar na conversa do WhatsApp se a nova mensagem foi enviada.",
-        };
+        return verifyExpectedWhatsAppMessage(expectedText, baseline, chat.messages);
     }
     async ensureWhatsAppPage() {
         const page = this.page;

package/dist/whatsapp_verification.js

@@ -0,0 +1,66 @@
+function normalizeVerificationText(value) {
+    return String(value || "")
+        .normalize("NFD")
+        .replace(/[\u0300-\u036f]/g, "")
+        .replace(/\s+/g, " ")
+        .toLowerCase()
+        .trim();
+}
+function isOutboundAuthor(author) {
+    const normalized = normalizeVerificationText(author);
+    return normalized === "voce" || normalized === "you";
+}
+function messageSignature(messages) {
+    return messages
+        .map((item) => `${normalizeVerificationText(item.author)}|${normalizeVerificationText(item.text)}`)
+        .join("\n");
+}
+function countMatches(messages, normalizedExpected) {
+    return messages.filter((item) => normalizeVerificationText(item.text).includes(normalizedExpected)).length;
+}
+function countOutboundMatches(messages, normalizedExpected) {
+    return messages.filter((item) => {
+        if (!isOutboundAuthor(item.author)) {
+            return false;
+        }
+        return normalizeVerificationText(item.text).includes(normalizedExpected);
+    }).length;
+}
+export function verifyExpectedWhatsAppMessage(expectedText, previousMessages, observedMessages) {
+    if (!observedMessages.length) {
+        return {
+            ok: false,
+            reason: "Nao consegui ler as mensagens visiveis apos o envio no WhatsApp.",
+        };
+    }
+    const baseline = Array.isArray(previousMessages) ? previousMessages : [];
+    const normalizedExpected = normalizeVerificationText(expectedText).slice(0, 200);
+    const changed = messageSignature(baseline) !== messageSignature(observedMessages);
+    const beforeMatches = countMatches(baseline, normalizedExpected);
+    const afterMatches = countMatches(observedMessages, normalizedExpected);
+    const beforeOutboundMatches = countOutboundMatches(baseline, normalizedExpected);
+    const afterOutboundMatches = countOutboundMatches(observedMessages, normalizedExpected);
+    const latestOutbound = [...observedMessages].reverse().find((item) => isOutboundAuthor(item.author)) || null;
+    const latestOutboundMatches = latestOutbound
+        ? normalizeVerificationText(latestOutbound.text).includes(normalizedExpected)
+        : false;
+    if ((changed && latestOutboundMatches) || (changed && afterOutboundMatches > beforeOutboundMatches) || (changed && afterMatches > beforeMatches)) {
+        return { ok: true, reason: "" };
+    }
+    if (!changed) {
+        return {
+            ok: false,
+            reason: "O WhatsApp nao mostrou mudanca visivel na conversa depois da tentativa de envio.",
+        };
+    }
+    if (afterMatches <= beforeMatches) {
+        return {
+            ok: false,
+            reason: "A conversa mudou, mas nao apareceu uma nova mensagem com o texto esperado no WhatsApp.",
+        };
+    }
+    return {
+        ok: false,
+        reason: "Nao consegui confirmar na conversa do WhatsApp se a nova mensagem foi enviada.",
+    };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leg3ndy/otto-bridge",
-  "version": "0.8.2",
+  "version": "0.8.3",
   "private": false,
   "type": "module",
   "description": "Local companion for Otto Bridge device pairing and WebSocket runtime.",