@leg3ndy/otto-bridge 0.7.4 → 0.7.5

package/dist/executors/native_macos.js

@@ -1190,10 +1190,14 @@ export class NativeMacOSJobExecutor {
                     if (!selected) {
                         throw new Error(`Nao consegui localizar a conversa do WhatsApp com ${action.contact}.`);
                     }
+                    const beforeSend = await this.readWhatsAppVisibleConversation(action.contact, 8).catch(() => ({
+                        messages: [],
+                        summary: "",
+                    }));
                     await reporter.progress(progressPercent, `Enviando a mensagem para ${action.contact} no WhatsApp`);
                     await this.sendWhatsAppMessage(action.text);
                     await delay(900);
-                    const verification = await this.verifyWhatsAppLastMessage(action.text);
+                    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.`);
                     }
@@ -2619,26 +2623,51 @@ return { messages: messages.slice(-maxMessages) };
         };
     }
     async verifyWhatsAppLastMessage(expectedText) {
+        return this.verifyWhatsAppLastMessageAgainstBaseline(expectedText);
+    }
+    async verifyWhatsAppLastMessageAgainstBaseline(expectedText, previousMessages) {
         const backgroundBrowser = await this.getWhatsAppBackgroundBrowser().catch(() => null);
         if (backgroundBrowser) {
-            return backgroundBrowser.verifyLastMessage(expectedText);
+            return backgroundBrowser.verifyLastMessage(expectedText, previousMessages);
         }
-        const chat = await this.readWhatsAppVisibleConversation("Contato", 6);
+        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, 60);
-        const matched = chat.messages.some((item) => normalizeText(item.text).includes(normalizedExpected));
-        if (!matched) {
+        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: "Nao consegui confirmar visualmente a mensagem enviada no WhatsApp.",
+                reason: "A conversa mudou, mas nao apareceu uma nova mensagem com o texto esperado no WhatsApp.",
             };
         }
-        return { ok: true, reason: "" };
+        return {
+            ok: false,
+            reason: "Nao consegui confirmar visualmente a nova mensagem enviada no WhatsApp.",
+        };
     }
     async takeScreenshot(targetPath) {
         const artifactsDir = path.join(os.homedir(), ".otto-bridge", "artifacts");

package/dist/macos_whatsapp_helper.js

@@ -125,6 +125,21 @@ export class MacOSWhatsAppHelperRuntime {
         await this.start();
         await this.call("hide_background");
     }
+    async nativeInsertText(text) {
+        await this.start();
+        const result = await this.call("native_insert_text", { text });
+        return result?.ok === true;
+    }
+    async nativeClearText() {
+        await this.start();
+        const result = await this.call("native_clear_text");
+        return result?.ok === true;
+    }
+    async nativePressEnter() {
+        await this.start();
+        const result = await this.call("native_press_enter");
+        return result?.ok === true;
+    }
     async evaluate(script) {
         await this.start();
         return await this.call("evaluate_js", { script });
@@ -287,12 +302,16 @@ export class MacOSWhatsAppHelperRuntime {
         if (!(prepared.ok === true)) {
             return false;
         }
+        let enterTriggered = false;
+        let clickFallbackTriggered = false;
         const deadline = Date.now() + 6_000;
         while (Date.now() < deadline) {
             await delay(500);
             const result = await this.evaluate(`
 (() => {
   const query = ${JSON.stringify(contact)};
+  const enterTriggered = ${JSON.stringify(enterTriggered)};
+  const clickFallbackTriggered = ${JSON.stringify(clickFallbackTriggered)};
   const normalize = (value) => String(value || "").normalize("NFD").replace(/[\\u0300-\\u036f]/g, "").toLowerCase().trim();
   const normalizedQuery = normalize(query);
 
@@ -305,6 +324,37 @@ export class MacOSWhatsAppHelperRuntime {
     return rect.bottom >= 0 && rect.right >= 0 && rect.top <= window.innerHeight && rect.left <= window.innerWidth;
   }
 
+  function isConversationOpen() {
+    const footerVisible = Array.from(document.querySelectorAll('footer, main footer'))
+      .some((node) => isVisible(node));
+    const composerVisible = Array.from(document.querySelectorAll('[data-testid="conversation-compose-box-input"], footer div[contenteditable="true"], main footer [contenteditable="true"], footer textarea'))
+      .some((node) => isVisible(node));
+    const headerMatch = Array.from(document.querySelectorAll('header span[title], header div[title], main span[title], main div[title]'))
+      .filter((node) => node instanceof HTMLElement)
+      .filter((node) => isVisible(node))
+      .some((node) => {
+        const text = normalize(node.getAttribute("title") || node.textContent || "");
+        return text === normalizedQuery || text.includes(normalizedQuery);
+      });
+    return footerVisible || composerVisible || headerMatch;
+  }
+
+  if (isConversationOpen()) {
+    return { clicked: true, activatedBy: "already-open" };
+  }
+
+  const searchCandidates = Array.from(document.querySelectorAll('div[contenteditable="true"][role="textbox"], input[role="textbox"], textarea, div[contenteditable="true"][data-tab], [data-testid="chat-list-search"] [contenteditable="true"]'))
+    .filter((node) => node instanceof HTMLElement)
+    .filter((node) => isVisible(node));
+  const searchBox = searchCandidates[0];
+  if (!enterTriggered && searchBox instanceof HTMLElement) {
+    searchBox.focus();
+    searchBox.dispatchEvent(new KeyboardEvent("keydown", { key: "Enter", code: "Enter", keyCode: 13, which: 13, bubbles: true }));
+    searchBox.dispatchEvent(new KeyboardEvent("keypress", { key: "Enter", code: "Enter", keyCode: 13, which: 13, bubbles: true }));
+    searchBox.dispatchEvent(new KeyboardEvent("keyup", { key: "Enter", code: "Enter", keyCode: 13, which: 13, bubbles: true }));
+    return { clicked: false, enterTriggered: true };
+  }
+
   const titleNodes = Array.from(document.querySelectorAll('span[title], div[title]'))
     .filter((node) => node instanceof HTMLElement)
     .filter((node) => isVisible(node))
@@ -325,17 +375,27 @@ export class MacOSWhatsAppHelperRuntime {
     return { clicked: false };
   }
 
+  if (clickFallbackTriggered) {
+    return { clicked: false };
+  }
+
   const winner = titleNodes[0];
   const target = winner.container instanceof HTMLElement ? winner.container : winner.node;
   target.scrollIntoView({ block: "center", inline: "center", behavior: "auto" });
   if (typeof target.click === "function") {
     target.click();
-    return { clicked: true };
+    return { clicked: false, clickFallbackTriggered: true };
   }
   target.dispatchEvent(new MouseEvent("click", { bubbles: true, cancelable: true, view: window }));
-  return { clicked: true };
+  return { clicked: false, clickFallbackTriggered: true };
 })()
       `);
+            if (result.enterTriggered === true) {
+                enterTriggered = true;
+            }
+            if (result.clickFallbackTriggered === true) {
+                clickFallbackTriggered = true;
+            }
             if (result.clicked === true) {
                 return true;
             }
@@ -398,50 +458,91 @@ export class MacOSWhatsAppHelperRuntime {
   }
 
   const composer = candidates[0].node;
-  composer.focus();
   if (composer instanceof HTMLInputElement || composer instanceof HTMLTextAreaElement) {
+    composer.focus();
+    composer.click();
     composer.value = "";
     composer.dispatchEvent(new Event("input", { bubbles: true }));
     composer.value = value;
     composer.dispatchEvent(new Event("input", { bubbles: true }));
-  } else {
-    const selection = window.getSelection();
-    const range = document.createRange();
-    range.selectNodeContents(composer);
-    selection?.removeAllRanges();
-    selection?.addRange(range);
-    document.execCommand("selectAll", false);
-    document.execCommand("delete", false);
-    document.execCommand("insertText", false, value);
-    if ((composer.innerText || "").trim() !== value.trim()) {
-      composer.textContent = value;
+    composer.click();
+
+    const sendCandidates = Array.from(document.querySelectorAll('[data-testid="compose-btn-send"], button[aria-label*="Send"], button[aria-label*="Enviar"], span[data-icon="send"], div[role="button"][aria-label*="Send"], div[role="button"][aria-label*="Enviar"]'))
+      .map((node) => node instanceof HTMLElement ? (node.closest('button, div[role="button"]') || node) : null)
+      .filter((node) => node instanceof HTMLElement)
+      .filter((node) => isVisible(node));
+
+    const sendButton = sendCandidates[0];
+    if (sendButton instanceof HTMLElement) {
+      sendButton.scrollIntoView({ block: "center", inline: "center", behavior: "auto" });
+      if (typeof sendButton.click === "function") {
+        sendButton.click();
+        return { sent: true };
+      }
+      sendButton.dispatchEvent(new MouseEvent("click", { bubbles: true, cancelable: true, view: window }));
+      return { sent: true };
     }
-    composer.dispatchEvent(new Event("input", { bubbles: true }));
+
+    composer.dispatchEvent(new KeyboardEvent("keydown", { key: "Enter", code: "Enter", keyCode: 13, which: 13, bubbles: true }));
+    composer.dispatchEvent(new KeyboardEvent("keypress", { key: "Enter", code: "Enter", keyCode: 13, which: 13, bubbles: true }));
+    composer.dispatchEvent(new KeyboardEvent("keyup", { key: "Enter", code: "Enter", keyCode: 13, which: 13, bubbles: true }));
+    return { sent: true };
+  } else {
+    composer.focus();
+    composer.click();
+    return { nativeInputRequired: true };
+  }
+})()
+      `);
+            if (result.nativeInputRequired === true) {
+                const cleared = await this.nativeClearText();
+                if (!cleared) {
+                    throw new Error("O helper nativo do WhatsApp nao conseguiu limpar o rascunho da mensagem.");
+                }
+                const inserted = await this.nativeInsertText(text);
+                if (!inserted) {
+                    throw new Error("O helper nativo do WhatsApp nao conseguiu digitar a mensagem.");
+                }
+                await delay(250);
+                const clickResult = await this.evaluate(`
+(() => {
+  function isVisible(element) {
+    if (!(element instanceof HTMLElement)) return false;
+    const rect = element.getBoundingClientRect();
+    if (rect.width < 6 || rect.height < 6) return false;
+    const style = window.getComputedStyle(element);
+    if (style.visibility === "hidden" || style.display === "none" || Number(style.opacity || "1") === 0) return false;
+    return rect.bottom >= 0 && rect.right >= 0 && rect.top <= window.innerHeight && rect.left <= window.innerWidth;
   }
-  composer.click();
 
-  const sendCandidates = Array.from(document.querySelectorAll('[data-testid="compose-btn-send"], button[aria-label*="Send"], button[aria-label*="Enviar"], span[data-icon="send"], div[role="button"][aria-label*="Send"], div[role="button"][aria-label*="Enviar"]'))
+  const sendCandidates = Array.from(document.querySelectorAll('[data-testid="compose-btn-send"], button[aria-label*="Send"], button[aria-label*="Enviar"], span[data-icon="send"], div[role="button"][aria-label*="Send"], div[role="button"][aria-label*="Enviar"], footer [data-icon="send-filled"], footer [data-icon="wds-ic-send-filled"]'))
     .map((node) => node instanceof HTMLElement ? (node.closest('button, div[role="button"]') || node) : null)
     .filter((node) => node instanceof HTMLElement)
     .filter((node) => isVisible(node));
 
   const sendButton = sendCandidates[0];
-  if (sendButton instanceof HTMLElement) {
-    sendButton.scrollIntoView({ block: "center", inline: "center", behavior: "auto" });
-    if (typeof sendButton.click === "function") {
-      sendButton.click();
-      return { sent: true };
-    }
-    sendButton.dispatchEvent(new MouseEvent("click", { bubbles: true, cancelable: true, view: window }));
-    return { sent: true };
+  if (!(sendButton instanceof HTMLElement)) {
+    return { clicked: false };
   }
 
-  composer.dispatchEvent(new KeyboardEvent("keydown", { key: "Enter", code: "Enter", keyCode: 13, which: 13, bubbles: true }));
-  composer.dispatchEvent(new KeyboardEvent("keypress", { key: "Enter", code: "Enter", keyCode: 13, which: 13, bubbles: true }));
-  composer.dispatchEvent(new KeyboardEvent("keyup", { key: "Enter", code: "Enter", keyCode: 13, which: 13, bubbles: true }));
-  return { sent: true };
+  sendButton.scrollIntoView({ block: "center", inline: "center", behavior: "auto" });
+  if (typeof sendButton.click === "function") {
+    sendButton.click();
+    return { clicked: true };
+  }
+  sendButton.dispatchEvent(new MouseEvent("click", { bubbles: true, cancelable: true, view: window }));
+  return { clicked: true };
 })()
-      `);
+        `);
+                if (clickResult.clicked === true) {
+                    return;
+                }
+                const submitted = await this.nativePressEnter();
+                if (!submitted) {
+                    throw new Error("O helper nativo do WhatsApp nao conseguiu enviar a mensagem.");
+                }
+                return;
+            }
             if (result.sent === true) {
                 return;
             }
@@ -495,23 +596,45 @@ export class MacOSWhatsAppHelperRuntime {
                 : "(sem mensagens visiveis na conversa)",
         };
     }
-    async verifyLastMessage(expectedText) {
-        const chat = await this.readVisibleConversation(6);
+    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, 60);
-        const matched = chat.messages.some((item) => normalizeText(item.text).includes(normalizedExpected));
-        if (!matched) {
+        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: "Nao consegui confirmar na conversa do WhatsApp se a mensagem foi enviada.",
+                reason: "A conversa mudou, mas nao apareceu uma nova mensagem com o texto esperado no WhatsApp.",
             };
         }
-        return { ok: true, reason: "" };
+        return {
+            ok: false,
+            reason: "Nao consegui confirmar na conversa do WhatsApp se a nova mensagem foi enviada.",
+        };
     }
     handleStdout(chunk) {
         this.stdoutBuffer += chunk;

package/dist/macos_whatsapp_helper_source.js

@@ -90,6 +90,13 @@ final class OttoWhatsAppHelper: NSObject, WKNavigationDelegate {
     case "hide_background":
       hideBackground()
       sendResponse(id: id, result: ["background": true])
+    case "native_insert_text":
+      let text = String(describing: params["text"] ?? "")
+      sendResponse(id: id, result: ["ok": nativeInsertText(text)])
+    case "native_clear_text":
+      sendResponse(id: id, result: ["ok": nativeClearText()])
+    case "native_press_enter":
+      sendResponse(id: id, result: ["ok": nativePressEnter()])
     case "load_whatsapp":
       ensureWhatsAppLoaded()
       sendResponse(id: id, result: ["url": webView.url?.absoluteString ?? ""])
@@ -134,6 +141,14 @@ final class OttoWhatsAppHelper: NSObject, WKNavigationDelegate {
     app.activate(ignoringOtherApps: true)
   }
 
+  private func prepareInteractionWindow() {
+    window.ignoresMouseEvents = true
+    window.alphaValue = 0
+    window.setFrame(NSRect(x: -2200, y: 80, width: 1320, height: 920), display: false)
+    window.makeKeyAndOrderFront(nil)
+    app.activate(ignoringOtherApps: true)
+  }
+
   private func hideBackground() {
     window.ignoresMouseEvents = true
     window.alphaValue = 0
@@ -141,6 +156,44 @@ final class OttoWhatsAppHelper: NSObject, WKNavigationDelegate {
     window.orderFrontRegardless()
   }
 
+  private func currentTextInputClient() -> NSTextInputClient? {
+    if let client = window.firstResponder as? NSTextInputClient {
+      return client
+    }
+    if let client = webView as? NSTextInputClient {
+      return client
+    }
+    return nil
+  }
+
+  private func nativeInsertText(_ text: String) -> Bool {
+    prepareInteractionWindow()
+    guard let client = currentTextInputClient() else {
+      return false
+    }
+    client.insertText(text, replacementRange: NSRange(location: NSNotFound, length: 0))
+    return true
+  }
+
+  private func nativeClearText() -> Bool {
+    prepareInteractionWindow()
+    guard let responder = window.firstResponder else {
+      return false
+    }
+    responder.selectAll(nil)
+    responder.doCommand(by: #selector(NSResponder.deleteBackward(_:)))
+    return true
+  }
+
+  private func nativePressEnter() -> Bool {
+    prepareInteractionWindow()
+    guard let responder = window.firstResponder else {
+      return false
+    }
+    responder.doCommand(by: #selector(NSResponder.insertNewline(_:)))
+    return true
+  }
+
   private func evaluateJavaScript(_ script: String, completion: @escaping (Any?, Error?) -> Void) {
     webView.evaluateJavaScript(script) { result, error in
       completion(result, error)

package/dist/types.js

@@ -1,5 +1,5 @@
 export const BRIDGE_CONFIG_VERSION = 1;
-export const BRIDGE_VERSION = "0.7.4";
+export const BRIDGE_VERSION = "0.7.5";
 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

@@ -693,26 +693,48 @@ export class WhatsAppBackgroundBrowser {
                 : "(sem mensagens visiveis na conversa)",
         };
     }
-    async verifyLastMessage(expectedText) {
+    async verifyLastMessage(expectedText, previousMessages) {
         if (this.helperRuntime) {
-            return await this.helperRuntime.verifyLastMessage(expectedText);
+            return await this.helperRuntime.verifyLastMessage(expectedText, previousMessages);
         }
-        const chat = await this.readVisibleConversation(6);
+        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, 60);
-        const matched = chat.messages.some((item) => normalizeText(item.text).includes(normalizedExpected));
-        if (!matched) {
+        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: "Nao consegui confirmar na conversa do WhatsApp se a mensagem foi enviada.",
+                reason: "O WhatsApp nao mostrou mudanca visivel na conversa depois da tentativa de envio.",
             };
         }
-        return { ok: true, reason: "" };
+        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.",
+        };
     }
     async ensureWhatsAppPage() {
         const page = this.page;

package/package.json

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