@leg3ndy/otto-bridge 0.7.5 → 0.7.6

package/dist/executors/native_macos.js

@@ -2366,6 +2366,9 @@ function isVisible(element) {
 
 function focusAndReplaceContent(element, value) {
   element.focus();
+  if (typeof element.click === "function") {
+    element.click();
+  }
   const range = document.createRange();
   range.selectNodeContents(element);
   const selection = window.getSelection();
@@ -2373,7 +2376,14 @@ function focusAndReplaceContent(element, value) {
   selection?.addRange(range);
   document.execCommand("selectAll", false);
   document.execCommand("delete", false);
+  if ((element.innerText || element.textContent || "").trim().length > 0) {
+    element.textContent = "";
+    element.dispatchEvent(new InputEvent("input", { bubbles: true, data: "", inputType: "deleteContentBackward" }));
+  }
   document.execCommand("insertText", false, value);
+  if ((element.innerText || "").trim() !== value.trim()) {
+    element.textContent = value;
+  }
   element.dispatchEvent(new InputEvent("input", { bubbles: true, data: value, inputType: "insertText" }));
 }
 
@@ -2418,18 +2428,36 @@ function isVisible(element) {
   return rect.bottom >= 0 && rect.right >= 0 && rect.top <= window.innerHeight && rect.left <= window.innerWidth;
 }
 
+function pickClickTarget(node) {
+  const selectors = [
+    '[role="gridcell"]',
+    '[role="listitem"]',
+    '[data-testid="cell-frame-container"]',
+    'div[tabindex]',
+  ];
+  for (const selector of selectors) {
+    const candidate = node.closest(selector);
+    if (candidate instanceof HTMLElement && isVisible(candidate)) {
+      return candidate;
+    }
+  }
+  return node instanceof HTMLElement && isVisible(node) ? node : null;
+}
+
 const titleNodes = Array.from(document.querySelectorAll('span[title], div[title]'))
   .filter((node) => node instanceof HTMLElement)
   .filter((node) => isVisible(node))
   .map((node) => {
     const text = normalize(node.getAttribute("title") || node.textContent || "");
+    const target = pickClickTarget(node);
     let score = 0;
     if (text === normalizedQuery) score += 160;
     if (text.includes(normalizedQuery)) score += 100;
     if (normalizedQuery.includes(text) && text.length >= 3) score += 50;
-    const container = node.closest('[data-testid="cell-frame-container"], [role="listitem"], [role="gridcell"], div[tabindex]');
-    if (container instanceof HTMLElement && isVisible(container)) score += 20;
-    return { node, container, text, score };
+    if (target instanceof HTMLElement && target !== node) score += 20;
+    if (target instanceof HTMLElement && target.getAttribute("role") === "gridcell") score += 30;
+    if (target instanceof HTMLElement && target.getAttribute("role") === "listitem") score += 20;
+    return { node, target, text, score };
   })
   .filter((item) => item.score > 0)
   .sort((left, right) => right.score - left.score);
@@ -2439,12 +2467,10 @@ if (!titleNodes.length) {
 }
 
 const winner = titleNodes[0];
-const target = winner.container instanceof HTMLElement ? winner.container : winner.node;
+const target = winner.target instanceof HTMLElement ? winner.target : winner.node;
 target.scrollIntoView({ block: "center", inline: "center", behavior: "auto" });
-if (typeof target.click === "function") {
-  target.click();
-  return { clicked: true };
-}
+target.dispatchEvent(new MouseEvent("mousedown", { bubbles: true, cancelable: true, view: window }));
+target.dispatchEvent(new MouseEvent("mouseup", { bubbles: true, cancelable: true, view: window }));
 target.dispatchEvent(new MouseEvent("click", { bubbles: true, cancelable: true, view: window }));
 return { clicked: true };
       `, { contact }, this.getWhatsAppWebScriptOptions(false));

package/dist/macos_whatsapp_helper.js

@@ -275,35 +275,37 @@ export class MacOSWhatsAppHelperRuntime {
 
   const searchBox = candidates[0].node;
   searchBox.focus();
+  if (typeof searchBox.click === "function") {
+    searchBox.click();
+  }
 
   if (searchBox instanceof HTMLInputElement || searchBox instanceof HTMLTextAreaElement) {
     searchBox.value = "";
     searchBox.dispatchEvent(new Event("input", { bubbles: true }));
     searchBox.value = contact;
     searchBox.dispatchEvent(new Event("input", { bubbles: true }));
+    return { ok: true, nativeInputRequired: false };
   } else {
-    const selection = window.getSelection();
-    const range = document.createRange();
-    range.selectNodeContents(searchBox);
-    selection?.removeAllRanges();
-    selection?.addRange(range);
-    document.execCommand("selectAll", false);
-    document.execCommand("delete", false);
-    document.execCommand("insertText", false, contact);
-    if ((searchBox.innerText || "").trim() !== contact.trim()) {
-      searchBox.textContent = contact;
-    }
+    searchBox.textContent = "";
     searchBox.dispatchEvent(new Event("input", { bubbles: true }));
+    return { ok: true, nativeInputRequired: true };
   }
-
-  return { ok: true };
 })()
     `);
         if (!(prepared.ok === true)) {
             return false;
         }
+        if (prepared.nativeInputRequired === true) {
+            await this.nativeClearText().catch(() => false);
+            const inserted = await this.nativeInsertText(contact).catch(() => false);
+            if (!inserted) {
+                return false;
+            }
+        }
+        await delay(1000);
         let enterTriggered = false;
-        let clickFallbackTriggered = false;
+        let clickAttempts = 0;
+        const searchStartedAt = Date.now();
         const deadline = Date.now() + 6_000;
         while (Date.now() < deadline) {
             await delay(500);
@@ -311,7 +313,8 @@ export class MacOSWhatsAppHelperRuntime {
 (() => {
   const query = ${JSON.stringify(contact)};
   const enterTriggered = ${JSON.stringify(enterTriggered)};
-  const clickFallbackTriggered = ${JSON.stringify(clickFallbackTriggered)};
+  const clickAttempts = ${JSON.stringify(clickAttempts)};
+  const allowEnterFallback = ${JSON.stringify(Date.now() - searchStartedAt >= 2_500)};
   const normalize = (value) => String(value || "").normalize("NFD").replace(/[\\u0300-\\u036f]/g, "").toLowerCase().trim();
   const normalizedQuery = normalize(query);
 
@@ -324,77 +327,107 @@ export class MacOSWhatsAppHelperRuntime {
     return rect.bottom >= 0 && rect.right >= 0 && rect.top <= window.innerHeight && rect.left <= window.innerWidth;
   }
 
+  function pickClickTarget(node) {
+    const selectors = [
+      '[role="gridcell"]',
+      '[role="listitem"]',
+      '[data-testid="cell-frame-container"]',
+      'div[tabindex]',
+    ];
+    for (const selector of selectors) {
+      const candidate = node.closest(selector);
+      if (candidate instanceof HTMLElement && isVisible(candidate)) {
+        return candidate;
+      }
+    }
+    return node instanceof HTMLElement && isVisible(node) ? node : null;
+  }
+
   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]'))
+    const headerMatch = Array.from(document.querySelectorAll('main header span[title], main header div[title], [data-testid="conversation-info-header-chat-title"], 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 text === normalizedQuery
+          || text.includes(normalizedQuery)
+          || (normalizedQuery.includes(text) && text.length >= 3);
       });
-    return footerVisible || composerVisible || headerMatch;
+    const composerTargetMatch = Array.from(document.querySelectorAll('[data-testid="conversation-compose-box-input"] [contenteditable="true"], footer div[contenteditable="true"], main footer [contenteditable="true"], footer textarea'))
+      .filter((node) => node instanceof HTMLElement)
+      .filter((node) => isVisible(node))
+      .some((node) => {
+        const text = normalize(
+          node.getAttribute("aria-label")
+          || node.getAttribute("aria-placeholder")
+          || node.getAttribute("placeholder")
+          || ""
+        );
+        return text.includes(normalizedQuery);
+      });
+    return (headerMatch || composerTargetMatch) && (footerVisible || composerVisible);
   }
 
   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))
     .map((node) => {
       const text = normalize(node.getAttribute("title") || node.textContent || "");
+      const target = pickClickTarget(node);
       let score = 0;
       if (text === normalizedQuery) score += 160;
       if (text.includes(normalizedQuery)) score += 100;
       if (normalizedQuery.includes(text) && text.length >= 3) score += 50;
-      const container = node.closest('[data-testid="cell-frame-container"], [role="listitem"], [role="gridcell"], div[tabindex]');
-      if (container instanceof HTMLElement && isVisible(container)) score += 20;
-      return { node, container, score };
+      if (target instanceof HTMLElement && target !== node) score += 20;
+      if (target instanceof HTMLElement && target.getAttribute("role") === "gridcell") score += 30;
+      if (target instanceof HTMLElement && target.getAttribute("role") === "listitem") score += 20;
+      return { node, target, score };
     })
     .filter((item) => item.score > 0)
     .sort((left, right) => right.score - left.score);
 
-  if (!titleNodes.length) {
-    return { clicked: false };
-  }
+  if (titleNodes.length) {
+    if (clickAttempts >= 4) {
+      return { clicked: false };
+    }
 
-  if (clickFallbackTriggered) {
-    return { clicked: false };
+    const winner = titleNodes[0];
+    const target = winner.target instanceof HTMLElement ? winner.target : winner.node;
+    target.scrollIntoView({ block: "center", inline: "center", behavior: "auto" });
+    target.dispatchEvent(new MouseEvent("mousedown", { bubbles: true, cancelable: true, view: window }));
+    target.dispatchEvent(new MouseEvent("mouseup", { bubbles: true, cancelable: true, view: window }));
+    target.dispatchEvent(new MouseEvent("click", { bubbles: true, cancelable: true, view: window }));
+    return { clicked: false, clickAttempts: clickAttempts + 1 };
   }
 
-  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: false, clickFallbackTriggered: true };
+  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 (allowEnterFallback && !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 };
   }
-  target.dispatchEvent(new MouseEvent("click", { bubbles: true, cancelable: true, view: window }));
-  return { clicked: false, clickFallbackTriggered: true };
+
+  return { clicked: false };
 })()
       `);
             if (result.enterTriggered === true) {
                 enterTriggered = true;
             }
-            if (result.clickFallbackTriggered === true) {
-                clickFallbackTriggered = true;
+            if (typeof result.clickAttempts === "number") {
+                clickAttempts = result.clickAttempts;
             }
             if (result.clicked === true) {
                 return true;

package/dist/types.js

@@ -1,5 +1,5 @@
 export const BRIDGE_CONFIG_VERSION = 1;
-export const BRIDGE_VERSION = "0.7.5";
+export const BRIDGE_VERSION = "0.7.6";
 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/package.json

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