coffeeinabit 0.0.9 → 0.0.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "coffeeinabit",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "description": "CoffeeInABit App",
   "main": "server.js",
   "type": "module",

package/tools/send_connection_request.js

@@ -38,7 +38,7 @@ async function detectConnectionStatus(page, username) {
     moreActionsSelectors = await getButtonByText(page, 'More actions', inMain);
   }
   if (moreActionsSelectors && (await moreActionsSelectors.isVisible())) {
-    await moreActionsSelectors.click();
+    await clickWithRetries(moreActionsSelectors);
     await new Promise(resolve => setTimeout(resolve, Math.floor(Math.random() * 1000) + 500));
   }
   let removeConnectionButton = await getButtonByText(page, 'Remove Connection', inMain);
@@ -81,7 +81,7 @@ async function handleConnectButtonClick(page, username, inMain = true, handleSen
 
   if (connectButton && (await connectButton.isVisible())) {
     try {
-      await connectButton.click();
+      await clickWithRetries(connectButton);
       
       if (handleSendWithoutNote) {
         await new Promise(resolve => setTimeout(resolve, 2000));
@@ -96,7 +96,7 @@ async function handleConnectButtonClick(page, username, inMain = true, handleSen
         
         if (sendWithoutNoteButton && (await sendWithoutNoteButton.isVisible())) {
           try {
-            await sendWithoutNoteButton.click();
+            await clickWithRetries(sendWithoutNoteButton);
             await new Promise(resolve => setTimeout(resolve, 2000));
             return { status: 'success', message: `Connection request sent successfully to ${username}` };
           } catch (error) {
@@ -123,33 +123,56 @@ async function handleConnectButtonClick(page, username, inMain = true, handleSen
 }
 
 async function getButtonByText(page, text, inMain = false) {
-  let buttons = [];
-  
+  const candidates = Array.isArray(text) ? text : [text];
+  let elements = [];
   if (inMain) {
-    const mainContent = page.locator('main');
-    buttons = await mainContent.locator('button').all();
-    const spans = await page.locator('div[role="button"] span').all();
-    buttons = [...buttons, ...spans];
+    const main = page.locator('main');
+    elements = [
+      ...(await main.locator('button').all()),
+      ...(await main.locator('[role="button"]').all()),
+      ...(await main.locator('[aria-label]').all())
+    ];
   } else {
-    buttons = await page.locator('button').all();
-    const spans = await page.locator('div[role="button"] span').all();
-    buttons = [...buttons, ...spans];
-  }
-
-  for (let i = 0; i < buttons.length; i++) {
-    const button = buttons[i];
+    elements = [
+      ...(await page.locator('button').all()),
+      ...(await page.locator('[role="button"]').all()),
+      ...(await page.locator('[aria-label]').all())
+    ];
+  }
+  for (let i = 0; i < elements.length; i++) {
+    const el = elements[i];
     try {
-      if (!(await button.isVisible())) {
-        continue;
-      }
-      const buttonText = await button.textContent() || await button.innerText() || '';
-      if (buttonText.trim() === text) {
-        return button;
+      if (!(await el.isVisible())) continue;
+      const textContent = (await el.textContent()) || '';
+      const innerText = (await el.innerText()) || '';
+      const ariaLabel = (await el.getAttribute('aria-label')) || '';
+      const combined = `${textContent}\n${innerText}\n${ariaLabel}`.toLowerCase().replace(/\s+/g, ' ').trim();
+      for (const c of candidates) {
+        const needle = String(c).toLowerCase().trim();
+        if (!needle) continue;
+        if (combined === needle || combined.includes(needle)) {
+          await el.scrollIntoViewIfNeeded();
+          return el;
+        }
       }
-    } catch (error) {
+    } catch (_) {
       continue;
     }
   }
-  
   return null;
+}
+
+async function clickWithRetries(locator, retries = 3) {
+  for (let attempt = 0; attempt < retries; attempt++) {
+    try {
+      await locator.scrollIntoViewIfNeeded();
+      await locator.waitFor({ state: 'visible', timeout: 5000 });
+      await locator.click({ trial: false, timeout: 15000 });
+      return true;
+    } catch (_) {
+      await new Promise(r => setTimeout(r, 1000 * (attempt + 1)));
+    }
+  }
+  await locator.click();
+  return true;
 }