Merge branch 'develop' into discriptionbox

Author: AmitChauhan63390

maxun-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "maxun-core",
-  "version": "0.0.16",
+  "version": "0.0.17",
   "description": "Core package for Maxun, responsible for data extraction",
   "main": "build/index.js",
   "typings": "build/index.d.ts",

maxun-core/src/browserSide/scraper.js

@@ -725,6 +725,30 @@ function scrapableHeuristics(maxCountPerPage = 50, minArea = 20000, scrolls = 3,
       });
     }
 
+    function tryFallbackSelector(rootElement, originalSelector) {
+        let element = queryElement(rootElement, originalSelector);
+        
+        if (!element && originalSelector.includes('nth-child')) {
+            const match = originalSelector.match(/nth-child\((\d+)\)/);
+            if (match) {
+            const position = parseInt(match[1], 10);
+            
+            for (let i = position - 1; i >= 1; i--) {
+                const fallbackSelector = originalSelector.replace(/nth-child\(\d+\)/, `nth-child(${i})`);
+                element = queryElement(rootElement, fallbackSelector);
+                if (element) break;
+            }
+            
+            if (!element) {
+                const baseSelector = originalSelector.replace(/\:nth-child\(\d+\)/, '');
+                element = queryElement(rootElement, baseSelector);
+            }
+            }
+        }
+        
+        return element;
+    }
+
     // Main scraping logic with context support
     let containers = queryElementAll(document, listSelector);
     containers = Array.from(containers);
@@ -902,7 +926,7 @@ function scrapableHeuristics(maxCountPerPage = 50, minArea = 20000, scrolls = 3,
           for (const [label, { selector, attribute }] of Object.entries(nonTableFields)) {
               // Get the last part of the selector after any context delimiter
               const relativeSelector = selector.split(/(?:>>|:>>)/).slice(-1)[0];
-              const element = queryElement(container, relativeSelector);
+              const element = tryFallbackSelector(container, relativeSelector);
 
               if (element) {
                   record[label] = extractValue(element, attribute);

maxun-core/src/interpret.ts

@@ -825,6 +825,7 @@ export default class Interpreter extends EventEmitter {
                     button.click()
                   ]);
                   debugLog("Navigation successful after regular click");
+                  await page.waitForTimeout(2000);
                   paginationSuccess = true;
                 } catch (navError) {
                   debugLog("Regular click with navigation failed, trying dispatch event with navigation");
@@ -839,6 +840,7 @@ export default class Interpreter extends EventEmitter {
                       button.dispatchEvent('click')
                     ]);
                     debugLog("Navigation successful after dispatch event");
+                    await page.waitForTimeout(2000);
                     paginationSuccess = true;
                   } catch (dispatchNavError) {
                     try {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "maxun",
-  "version": "0.0.14",
+  "version": "0.0.15",
   "author": "Maxun",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
@@ -50,7 +50,7 @@
     "lodash": "^4.17.21",
     "loglevel": "^1.8.0",
     "loglevel-plugin-remote": "^0.6.8",
-    "maxun-core": "^0.0.16",
+    "maxun-core": "^0.0.17",
     "minio": "^8.0.1",
     "moment-timezone": "^0.5.45",
     "node-cron": "^3.0.3",

public/locales/de.json

@@ -163,7 +163,7 @@
         },
         "default": {
             "title": "Welche Daten möchten Sie extrahieren?",
-            "description": "Ein Roboter ist darauf ausgelegt, eine Aktion nach der anderen auszuführen. Sie können eine der folgenden Optionen wählen."
+            "description": "Ein Roboter kann eine oder mehrere Aktionen ausführen. Wählen Sie aus den unten aufgeführten Optionen."
         },
         "list_stages": {
             "initial": "Wählen Sie die Liste aus, die Sie extrahieren möchten, zusammen mit den darin enthaltenen Texten",

public/locales/en.json

@@ -170,7 +170,7 @@
       },
       "default": {
         "title": "What data do you want to extract?",
-        "description": "A robot is designed to perform one action at a time. You can choose any of the options below."
+        "description": "A robot can perform one or multiple actions. Choose from the options listed below."
       },
       "list_stages": {
         "initial": "Select the list you want to extract along with the texts inside it",

public/locales/es.json

@@ -164,7 +164,7 @@
     },
     "default": {
       "title": "¿Qué datos desea extraer?",
-      "description": "Un robot está diseñado para realizar una acción a la vez. Puede elegir cualquiera de las siguientes opciones."
+      "description": "Un robot puede realizar una o varias acciones. Elija entre las opciones que aparecen a continuación."
     },
     "list_stages": {
       "initial": "Seleccione la lista que desea extraer junto con los textos que contiene",

public/locales/ja.json

@@ -164,7 +164,7 @@
         },
         "default": {
             "title": "どのデータを抽出しますか？",
-            "description": "ロボットは一度に1つのアクションを実行するように設計されています。以下のオプションから選択できます。"
+            "description": "ロボットは1つまたは複数のアクションを実行できます。以下のオプションから選択してください。"
         },
         "list_stages": {
             "initial": "抽出したいリストとその中のテキストを選択してください",

public/locales/zh.json

@@ -164,7 +164,7 @@
     },
     "default": {
       "title": "您想提取什么数据？",
-      "description": "机器人设计为一次执行一个操作。您可以选择以下任何选项。"
+      "description": "机器人可以执行一个或多个动作。请从以下选项中选择。"
     },
     "list_stages": {
       "initial": "选择要提取的列表及其中的文本",